summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2015-04-28 21:36:11 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-28 22:49:16 +0200
commitf3947152775e3b13c7bec25aac30bec602d1e14e (patch)
tree640d83ca023464f050e556c8a905dd3157f49311
parent7cb26b4a6e8a413ff3d9d07966b63afbfcdb6749 (diff)
downloadcoreboot-f3947152775e3b13c7bec25aac30bec602d1e14e.tar.xz
gitconfig: Use the right make executable in git hooks
When installing git hooks through $(MAKE) gitconfig, make knows itself (and is a GNU make). So let it splice itself into hooks where necessary by replacing %MAKE%. Change-Id: Iaf778bfa3f17a8fe31312f871571ed89a9de5385 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/10018 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--Makefile.inc2
-rwxr-xr-xutil/gitconfig/pre-commit2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index d0a292c187..c1e7defb42 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -418,7 +418,7 @@ gitconfig:
for hook in commit-msg pre-commit ; do \
if [ util/gitconfig/$$hook -nt .git/hooks/$$hook -o \
! -x .git/hooks/$$hook ]; then \
- cp util/gitconfig/$$hook .git/hooks/$$hook; \
+ sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/$$hook > .git/hooks/$$hook; \
chmod +x .git/hooks/$$hook; \
fi; \
done
diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit
index 8ab3e5604e..ccf78d376c 100755
--- a/util/gitconfig/pre-commit
+++ b/util/gitconfig/pre-commit
@@ -1,2 +1,2 @@
#!/bin/sh
-exec make lint-stable
+exec %MAKE% lint-stable