diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 15:30:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 18:03:36 +0200 |
| commit | f1d0889058c112c5a594755be7f3482ced2da395 (patch) | |
| tree | 0b995cccb8e57add808376fe237948d0ed217354 /Makefile.in | |
| parent | be59288ff46a7f3462f5d055f06edacc59340c36 (diff) | |
put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.
Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 28 |
1 files changed, 14 insertions, 14 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 |