put result of make test-install into top-level test-install dir

... and rename all DEVINSTALL variables to TESTINSTALL.

Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27

7 files changed, 31 insertions, 31 deletions

diff --git a/Makefile.in b/Makefile.in
index 4ebdd7ca8e30..2fe994107178 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules
 clean: clean-host clean-build
 
 clean-host:
-	rm -fr $(DEVINSTALLDIR)
+	rm -fr $(TESTINSTALLDIR)
 	rm -fr $(INSTDIR)
 	rm -fr $(OUTDIR)
 	rm -fr $(WORKDIR)
@@ -282,14 +282,14 @@ endif
 	@false
 
 test-install: build
-	@rm -rf $(DEVINSTALLDIR)
-	@mkdir $(DEVINSTALLDIR)
+	@rm -rf $(TESTINSTALLDIR)
+	@mkdir $(TESTINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
+	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
-	@ooinstall $(DEVINSTALLDIR)/opt
+	@ooinstall $(TESTINSTALLDIR)/opt
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-	@macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app
+	@macosx-codesign-app-bundle $(TESTINSTALLDIR)/opt/LibreOffice.app
 endif
 ifneq ($(OS),MACOSX)
 	@install-gdb-printers -L
@@ -303,26 +303,26 @@ ifeq ($(OS),LINUX)
 	@echo
 	@echo "Test installation finished, you can now execute:"
 	@echo
-	@echo "$(DEVINSTALLDIR)/program/soffice"
+	@echo "$(TESTINSTALLDIR)/program/soffice"
 else ifeq ($(OS),MACOSX)
 	@echo
 	@echo "Developer installation finished, you can now run:"
 	@echo
-	@echo "  open $(DEVINSTALLDIR)/LibreOffice.app"
+	@echo "  open $(TESTINSTALLDIR)/LibreOffice.app"
 	@echo
-	@echo "To debug: gdb $(DEVINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
+	@echo "To debug: gdb $(TESTINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
 endif
 
 install-tb:
-	@rm -rf $(DEVINSTALLDIR)
-	@mkdir $(DEVINSTALLDIR)
+	@rm -rf $(TESTINSTALLDIR)
+	@mkdir $(TESTINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
+	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
-	@ooinstall $(DEVINSTALLDIR)/opt
+	@ooinstall $(TESTINSTALLDIR)/opt
 	@install-gdb-printers
 endif
-	@rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
+	@rm -f $(BUILDDIR)/install && ln -s $(TESTINSTALLDIR)/opt/ $(BUILDDIR)/install
 
 distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-clean-up
diff --git a/config_host.mk.in b/config_host.mk.in
index 3b58d6625dc5..c25addb831d6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -86,7 +86,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
-export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
@@ -553,6 +552,7 @@ export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
 export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
 export TELEPATHY_CFLAGS=$(gb_SPACE)@TELEPATHY_CFLAGS@
 export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@
+export TESTINSTALLDIR=@TESTINSTALLDIR@
 export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
 export TLS=@TLS@
 export TMPDIR=@TEMP_DIRECTORY@
diff --git a/configure.ac b/configure.ac
index 8cb15d74475a..31988cd217c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12263,8 +12263,8 @@ AC_SUBST(DOCDIR)
 INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
 AC_SUBST(INSTALLDIR)
 
-DEVINSTALLDIR="$OUTDIR/installation"
-AC_SUBST(DEVINSTALLDIR)
+TESTINSTALLDIR="${BUILDDIR}/test-install/${INPATH}"
+AC_SUBST(TESTINSTALLDIR)
 
 # ===================================================================
 # De- or increase default verbosity of build process
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 0aeb5f7c9c08..7936e352a94e 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -95,20 +95,20 @@ endef
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	rm -rf $(instsetoo_OUT)
-ifeq (TRUE,$(LIBO_DEV_INSTALL))
+ifeq (TRUE,$(LIBO_TEST_INSTALL))
 	$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
-	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
-	mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
-	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
+	unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
+	mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/opt
+	rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
 	$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
-	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
-	mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
-        $(DEVINSTALLDIR)/opt/
-	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
-	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
+	unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+	mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
+        $(TESTINSTALLDIR)/opt/
+	rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
+	rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
 endif
-else # LIBO_DEV_INSTALL
+else # LIBO_TEST_INSTALL
 	$(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
 	$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
@@ -124,6 +124,6 @@ ifneq (WNT,$(OS))
 	$(foreach lang,$(instsetoo_native_WITH_LANG),\
 		$(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
 endif
-endif # LIBO_DEV_INSTALL
+endif # LIBO_TEST_INSTALL
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 7c24f9af93fb..269484792f55 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -24,7 +24,7 @@ include $(SOLARENV)/gbuild/gbuild.mk
 
 findunusedcode:
 	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
-	ooinstall -l $(DEVINSTALLDIR)/opt
+	ooinstall -l $(TESTINSTALLDIR)/opt
 	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
 	callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
 	  $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 4c2aa393c78c..599c1b157f31 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -9,7 +9,7 @@
 
 GDBDIR="${SOLARENV}/gdb"
 SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
-INSTALLDIR="${DEVINSTALLDIR}/opt"
+INSTALLDIR="${TESTINSTALLDIR}/opt"
 DYLIB=so
 if [ "$(uname)" = Darwin ]; then
     INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 23a2431567b5..23e2d09df723 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -262,7 +262,7 @@ gb_GLOBALDEFS += \
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
-gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/)
+gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(TESTINSTALLDIR)/)
 
 include $(GBUILDDIR)/Deliver.mk