diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 4 | ||||
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 2fe994107178..4bace5977f6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -283,13 +283,13 @@ endif test-install: build @rm -rf $(TESTINSTALLDIR) - @mkdir $(TESTINSTALLDIR) + @mkdir -p $(TESTINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS) else - @ooinstall $(TESTINSTALLDIR)/opt + @ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) - @macosx-codesign-app-bundle $(TESTINSTALLDIR)/opt/LibreOffice.app + @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app endif ifneq ($(OS),MACOSX) @install-gdb-printers -L @@ -298,7 +298,7 @@ endif @echo @echo "If you want to edit the .ui files with glade first execute:" @echo - @echo "export GLADE_CATALOG_SEARCH_PATH=$(SRCDIR)/install/share/glade" + @echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade" ifeq ($(OS),LINUX) @echo @echo "Test installation finished, you can now execute:" diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 7936e352a94e..ba9fc4bac7da 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -98,13 +98,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: ifeq (TRUE,$(LIBO_TEST_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,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 + mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) 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/ + $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk endif diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 599c1b157f31..af7639084ed2 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="${TESTINSTALLDIR}/opt" +INSTALLDIR="${TESTINSTALLDIR}" DYLIB=so if [ "$(uname)" = Darwin ]; then INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents |