From b786a33cfdca2e8a4114ddef0340e0e0628dd09c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 21 Oct 2011 17:18:13 +0200
Subject: Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR
 and BaseInstallation.

---
 configmgr/qa/unit/makefile.mk      | 2 +-
 configmgr/qa/unit/urebootstrap.ini | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'configmgr')

diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 78479784946f..60c3df7f1820 100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -69,7 +69,7 @@ TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb
     mkdir $(MISC)/unitdata/basis
     mkdir $(MISC)/unitdata/basis/program
     echo '[Bootstrap]' > $(MISC)/unitdata/basis/program/uno$(MY_INI)
-    echo 'UNO_SHARED_PACKAGES_CACHE = $$OOO_BASE_DIR' \
+    echo 'UNO_SHARED_PACKAGES_CACHE = $$BRAND_BASE_DIR' \
         >> $(MISC)/unitdata/basis/program/uno$(MY_INI)
     echo 'UNO_USER_PACKAGES_CACHE =' \
         '$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
diff --git a/configmgr/qa/unit/urebootstrap.ini b/configmgr/qa/unit/urebootstrap.ini
index c413645d0f43..341174fba70c 100755
--- a/configmgr/qa/unit/urebootstrap.ini
+++ b/configmgr/qa/unit/urebootstrap.ini
@@ -26,5 +26,4 @@
 #***********************************************************************/
 
 [Bootstrap]
-OOO_BASE_DIR = $ORIGIN/basis
 BRAND_BASE_DIR = $ORIGIN/brand
-- 
cgit