You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/10/25 19:28:46 UTC
svn commit: r1710474 - /openoffice/trunk/main/odk/pack/gendocu/makefile.mk
Author: damjan
Date: Sun Oct 25 18:28:46 2015
New Revision: 1710474
URL: http://svn.apache.org/viewvc?rev=1710474&view=rev
Log:
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.
Modified:
openoffice/trunk/main/odk/pack/gendocu/makefile.mk
Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1710474&r1=1710473&r2=1710474&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Sun Oct 25 18:28:46 2015
@@ -100,7 +100,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA
$(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)