Author: orw
Date: Mon Aug 5 15:00:14 2013
New Revision: 1510523
URL: http://svn.apache.org/r1510523
Log:
122938: further adjustment to get 'patch' working
Modified:
openoffice/trunk/main/solenv/inc/tg_ext.mk
Modified: openoffice/trunk/main/solenv/inc/tg_ext.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_ext.mk?rev=1510523&r1=1510522&r2=1510523&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_ext.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_ext.mk Mon Aug 5 15:00:14 2013
@@ -182,12 +182,12 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA
$(COMMAND_ECHO)$(TOUCH) $@
.ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
.IF "$(GUI)"=="WNT"
- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch $(PATCHFLAGS) -p2 &&
$(TOUCH) $(PATCH_FLAG_FILE)
+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch --binary $(PATCHFLAGS)
-p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS)
-p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
&& $(TOUCH) $(PATCH_FLAG_FILE)
+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) --binary
$(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
@@ -303,12 +303,12 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC
$(CONVERT) unix $(foreach,i,$(CONVERTFILES)
$(MISC)/$(TARFILE_ROOTDIR)/$i)
.ENDIF # "$(CONVERTFILES)"!=""
.IF "$(GUI)"=="WNT"
- $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch $(PATCHFLAGS) -p2
+ $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | patch --binary $(PATCHFLAGS)
-p2
.ELSE # "$(GUI)"=="WNT"
.IF "$(BSCLIENT)"=="TRUE"
$(COMMAND_ECHO)cd $(MISC) && $(TYPE)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS)
-p2
.ELSE # "$(BSCLIENT)"!=""
- $(COMMAND_ECHO)cd $(MISC) && $(TYPE)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
+ $(COMMAND_ECHO)cd $(MISC) && $(TYPE)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) --binary
$(PATCHFLAGS) -p2
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.IF "$(CONVERTFILES)"!=""
