summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2016-07-17 11:24:27 (GMT)
committerGitHub <noreply@github.com>2016-07-17 11:24:27 (GMT)
commit1c0f3d67b459f48101b6c15c3433ce7f1f93c9b6 (patch)
treeb6c48c415c7de9165fcfd303336b382d4bbf44b5
parentdc122c2ba98aa1fdeba0c75e31f9e3dd4b092c4a (diff)
parent09bea83f83129e0de809147858ac76e5bc46d872 (diff)
downloadmxe-1c0f3d67b459f48101b6c15c3433ce7f1f93c9b6.zip
mxe-1c0f3d67b459f48101b6c15c3433ce7f1f93c9b6.tar.gz
mxe-1c0f3d67b459f48101b6c15c3433ce7f1f93c9b6.tar.bz2
Merge pull request #1444 from tonytheodore/patch-gsed
patch.mk: portability fix for gsed
-rw-r--r--patch.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch.mk b/patch.mk
index 508de82..a97803b 100644
--- a/patch.mk
+++ b/patch.mk
@@ -34,8 +34,8 @@ endef
define IMPORT_PATCH
cd '$(call GIT_DIR,$(1))' \
&& cat '$(2)' \
- | sed '/^From/,$$ !d' \
- | sed s/'^From: MXE'/"From: fix@me"/'g;' \
+ | $(SED) '/^From/,$$ !d' \
+ | $(SED) s/'^From: MXE'/"From: fix@me"/'g;' \
| $(call GIT_CMD,$(1)) am --keep-cr ;
endef
@@ -55,8 +55,8 @@ define EXPORT_PATCH
--text \
-M9 \
dist..HEAD \
- | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \
- | sed 's/^index .......\.\......../index 1111111..2222222/' \
+ | $(SED) 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \
+ | $(SED) 's/^index .......\.\......../index 1111111..2222222/' \
) > '$(PATCH_BY_NAME)'
endef