Makefile.top | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 15f69da73429638692c1706c2b819d8fc6dc21d4
Author: Jan Holesovsky <ke...@suse.cz>
Date: Tue Jul 24 14:16:25 2012 +0200
Attempt to remove the last FORCE2ARCHIVE.
Change-Id: I7b0675151d39d6ce39c99ba3f85e8efebe303a2f
diff --git a/Makefile.top b/Makefile.top
index e7080dd..1c7b400 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
