[Libreoffice-commits] .: Makefile.in

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jan 7 12:11:13 PST 2013


 Makefile.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 568e489be45bb57c344326beec96a8b708d7e654
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 7 21:10:12 2013 +0100

    another fix of install test to work with "LibreOffice" installer name
    
    It is done by gbuild these days.
    
    Change-Id: I5a01d42f8e25eacc3f1c63d6f52e4144c7312cff

diff --git a/Makefile.in b/Makefile.in
index f0b5ce1..af83e64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,8 +325,8 @@ dev-install: build
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip"
-	mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
+	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip"
+	mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
 ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
@@ -352,8 +352,8 @@ install-tb:
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip"
-	mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
+	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip"
+	mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
 	@ooinstall $(DEVINSTALLDIR)/opt
 	@install-gdb-printers


More information about the Libreoffice-commits mailing list