[Libreoffice-commits] .: Branch 'libreoffice-4-0' - Makefile.top

[Libreoffice Gerrit user]

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

New commits:
commit 4f15dd36f6498d52e653056101616ec8dabe8434
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 7 21:05:22 2013 +0100

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

diff --git a/Makefile.top b/Makefile.top
index 28f56d2..3dabd7f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -282,8 +282,8 @@ dev-install: build
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd 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
@@ -309,8 +309,8 @@ install-tb:
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
 	cd 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