summaryrefslogtreecommitdiff
path: root/Makefile.top
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-07-24 14:16:25 +0200
committerJan Holesovsky <kendy@suse.cz>2012-07-24 14:17:11 +0200
commit15f69da73429638692c1706c2b819d8fc6dc21d4 (patch)
tree1832e47be31b8521844b9f312df7d897f14c10a3 /Makefile.top
parentd93eba476b45ca99792e9963064160539a9ddc19 (diff)
Attempt to remove the last FORCE2ARCHIVE.
Change-Id: I7b0675151d39d6ce39c99ba3f85e8efebe303a2f
Diffstat (limited to 'Makefile.top')
-rw-r--r--Makefile.top4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.top b/Makefile.top
index e7080dd8e831..1c7b400a33d3 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -429,7 +429,7 @@ dev-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
- cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE
+ cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive
unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
else
@@ -446,7 +446,7 @@ install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
- cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE
+ cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive
unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
else