diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-07 21:05:22 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-07 21:06:23 +0100 |
| commit | 4f15dd36f6498d52e653056101616ec8dabe8434 (patch) | |
| tree | c51af8ccde9a55f013294153ea0c02e334142b85 /Makefile.top | |
| parent | 4898e938a6730a0f4e53edc86871fa2480554c6f (diff) | |
another fix of install test to work with "LibreOffice" installer name
It is done by gbuild these days.
Change-Id: I6003a0f924d1db8b8d4b024173b905923d27bd71
Diffstat (limited to 'Makefile.top')
| -rw-r--r-- | Makefile.top | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.top b/Makefile.top index 28f56d2dcb5f..3dabd7f83c1a 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 |