odk/pack/gendocu/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 493bb354291470ce9ef88ad039023fe1453e3fbc Author: Damjan Jovanovic <dam...@apache.org> Date: Sun Oct 25 18:28:46 2015 +0000 Passing both -u and -o to unzip is ambiguous, as -u only overwrites files that are older while -o always overwrites them. What's worse, on FreeBSD using -u and -o together is an error that breaks the build. Tests show Info-ZIP's unzip treats -u and -o together as just -u, so let's call unzip with just -u. diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index a05c00f..d5c4e39 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -100,7 +100,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG) $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f) -$(MKDIRHIER) $(@:d) $(MY_COPY) $< $@ - cd $(JAVA_SRC_DIR) && unzip -quo $(@:f) + cd $(JAVA_SRC_DIR) && unzip -qu $(@:f) #$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/%.java : $(PRJ)$/source$/bean$/com$/sun$/star$/beans$/%.java # -$(MKDIRHIER) $(@:d) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits