Meta/Make: do not depend on installed git
Junio C Hamano committed
Dec 12, 2007 at 18:16 UTC
389f84506b391c83bcb8139ec92399ee38d52ebb
1 file changed
+8
-5
Make
+8
-5
@@ -4,7 +4,8 @@
4
# PATH=/usr/bin:/bin
5
6
G=/opt/packrat/playpen/public/in-place/git/index/gitweb_config.perl
7
-PATH=$HOME/git-master/bin:/usr/bin:/bin
7
+GIT=$HOME/git-master/bin/git
8
+PATH=/usr/bin:/bin
9
LANG=C
10
LC_CTYPE=C
11
export PATH LANG LC_CTYPE
@@ -15,14 +16,14 @@ export PATH LANG LC_CTYPE
16
17
old_style_def_fix=b79d18c92d9f4841a6a1a29b7b2373a8ff9871e1
18
18
-head=`git symbolic-ref HEAD 2>/dev/null` &&
19
+head=`$GIT symbolic-ref HEAD 2>/dev/null` &&
20
branch=`expr "$head" : 'refs/heads/\(.*\)'` || branch=detached
21
22
case "$branch" in
23
next | maint | master | pu)
24
d="prefix=$HOME/git-$branch" ;;
25
snap)
25
- v=`git describe HEAD`
26
+ v=`$GIT describe HEAD`
27
expr "$v" : '.*-g[0-9a-f]*$' >/dev/null && {
28
echo >&2 "You are on 'snap' but $v is not an official version."
29
exit 1
@@ -40,8 +41,8 @@ do
41
case "$1" in
42
-pedantic)
43
o= &&
43
- rev=$(git-rev-parse HEAD) &&
44
- case "$(git-merge-base "$old_style_def_fix" "$rev")" in
44
+ rev=$($GIT rev-parse HEAD) &&
45
+ case "$($GIT merge-base "$old_style_def_fix" "$rev")" in
46
$old_style_def_fix)
47
o=-Wold-style-definition ;;
48
esac
@@ -63,6 +64,8 @@ do
64
shift
65
done
66
67
+$GIT describe --abbrev=4 HEAD | sed -e 's/-/./g' >version
68
+
69
make $d \
70
GITWEB_CONFIG=$G \
71
PYTHON_PATH=/usr/bin/python2.4 \