[Libreoffice-commits] .: configure.in solenv/gbuild

[Jan Holesovsky]

 configure.in         |    2 +-
 solenv/gbuild/Zip.mk |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fef1909f0f242981e72549fba089a9509fe2bd63
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jul 25 13:24:09 2011 +0200

    Use --filesync instead of -FS as the zip option.

diff --git a/configure.in b/configure.in
index b119a67..201d57b 100755
--- a/configure.in
+++ b/configure.in
@@ -6283,7 +6283,7 @@ dnl We need zip and unzip
 dnl ===================================================================
 AC_PATH_PROG(ZIP, zip)
 test -z "$ZIP" && AC_MSG_ERROR([zip is required])
-if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
+if ! "$ZIP" --filesync < /dev/null 2>&1 > /dev/null; then
     AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
 fi
 
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 023fe36..1ed83cc 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -38,11 +38,11 @@ $(call gb_Zip_get_clean_target,%) :
 		rm -f $(call gb_Zip_get_outdir_target,$*))
 
 # rule to create zip package in workdir
-# -FS makes sure that all files in the zip package will be removed that no longer are in $(FILES)
+# --filesync makes sure that all files in the zip package will be removed that no longer are in $(FILES)
 $(call gb_Zip_get_target,%) :
 	$(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(call gb_Zip_get_target,$*)) && \
-	cd $(LOCATION) && $(gb_Zip_ZIPCOMMAND) -rX -FS $(call gb_Zip_get_target,$*) $(FILES) )
+	cd $(LOCATION) && $(gb_Zip_ZIPCOMMAND) -rX --filesync $(call gb_Zip_get_target,$*) $(FILES) )
 
 # the final target is a touch target; we use it as registered targets should be in workdir, not in outdir
 # the outdir target depends on the workdir target and is built by delivering the latter