solenv/inc/tg_ext.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f7c0526a120711b02ad69b68fd254fcd8f5e0f09
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Dec 9 00:54:46 2011 +0100
tg_ext.ml: fix patch when filename ambiguous
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index a6335a5..1ab9dc6 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -194,9 +194,9 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) :
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
$(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)} | tr -d "\015" | (cd
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(GUI)"=="WNT"
- $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) &&
$(GNUPATCH) $(PATCHFLAGS) -p3 ) && $(TOUCH) $(PATCH_FLAG_FILE)
+ $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | (cd .$(fake_root_dir) &&
$(GNUPATCH) $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
.IF "$(T_ADDITIONAL_FILES)"!=""
@@ -306,10 +306,10 @@ $(MISC)/$(TARFILE_ROOTDIR).done :
$(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
#.IF "$(my4ver:s/.//:s/,//)" >= "300"
# $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//)
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch
$(PATCHFLAGS) -p2 )
#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
- $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd
.$(fake_root_dir) && patch $(PATCHFLAGS) -p3 )
+ $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | (cd
.$(fake_root_dir) && patch $(PATCHFLAGS) -p2 )
#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
.ELSE # "$(GUI)"=="WNT"
- $(COMMAND_ECHO)cd $(MISC) && $(TYPE)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) &&
$(GNUPATCH) $(PATCHFLAGS) -p3 )
+ $(COMMAND_ECHO)cd $(MISC) && $(TYPE)
$(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | ( cd .$(fake_root_dir) &&
$(GNUPATCH) $(PATCHFLAGS) -p2 )
.ENDIF # "$(GUI)"=="WNT"
.IF "$(CONVERTFILES)"!=""
$(COMMAND_ECHO)$(CONVERT) dos $(foreach,i,$(CONVERTFILES)
$(MISC)/$(TARFILE_ROOTDIR)/$i)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
