Make: fix test installation.
Junio C Hamano committed
Jun 26, 2008 at 21:12 UTC
167e415e02f99d69fb2d02e75a08cc62030a27ac
1 file changed
+6
-4
Make
+6
-4
@@ -21,18 +21,20 @@ branch=`expr "$head" : 'refs/heads/\(.*\)'` || branch=detached
21
22
case "$branch" in
23
next | maint | master | pu)
24
- d="prefix=$HOME/git-$branch" ;;
24
+ prefix="$HOME/git-$branch"
25
+ ;;
26
snap)
27
v=`$GIT describe HEAD`
28
expr "$v" : '.*-g[0-9a-f]*$' >/dev/null && {
29
echo >&2 "You are on 'snap' but $v is not an official version."
30
exit 1
31
}
31
- d="prefix=$HOME/git-snap-$v"
32
+ prefix="$HOME/git-snap-$v"
33
;;
34
*)
34
- d="prefix=$HOME/git-test gitexecdir=\$(prefix)/libexec/git-core" ;;
35
+ prefix="$HOME/git-test" ;;
36
esac
37
+d="prefix=$prefix"
38
39
: ${O=-O2}
40
@@ -71,7 +73,7 @@ sh -c 'git describe --abbrev=4 HEAD' >/dev/null 2>&1 || {
73
make $d \
74
GITWEB_CONFIG=$G \
75
PYTHON_PATH=/usr/bin/python2.4 \
74
- ETC_GITCONFIG=$d/etc/gitconfig \
76
+ ETC_GITCONFIG=$prefix/etc/gitconfig \
77
CFLAGS="$O -Wall -Wdeclaration-after-statement -g" \
78
"$@"
79
status=$?