summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-13 23:34:58 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-13 23:34:58 -0800
commit6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 (patch)
tree8bf0c7f24c13ab2cd0e401ef1b609d30486606e9 /Makefile
parent057f98eda179491c3f32c556f523e8786c2cbab5 (diff)
parent365463851303f74eb5e5be7101811f215602fcd9 (diff)
downloadgit-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.gz
Merge some proposed fixes
Conflicts: Documentation/git-commit.txt - taking the post 1.2.0 semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f240e452b6..d40aa6a7d8 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ all:
# change being considered an inode change from the update-cache perspective.
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
- @$(SHELL) ./GIT-VERSION-GEN
+ @$(SHELL_PATH) ./GIT-VERSION-GEN
-include GIT-VERSION-FILE
# CFLAGS and LDFLAGS are for the users to override from the command line.