]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Make: fix test installation.
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2008 04:12:17 +0000 (21:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Jun 2008 04:12:17 +0000 (21:12 -0700)
Make

diff --git a/Make b/Make
index 77f3f7dbb589242d940347e23c2be08234f77a7b..74d2f1dc41c63a16e648e6ca4244418685a87329 100755 (executable)
--- a/Make
+++ b/Make
@@ -21,18 +21,20 @@ branch=`expr "$head" : 'refs/heads/\(.*\)'` || branch=detached
 
 case "$branch" in
 next | maint | master | pu)
-       d="prefix=$HOME/git-$branch" ;;
+       prefix="$HOME/git-$branch"
+       ;;
 snap)
        v=`$GIT describe HEAD`
        expr "$v" : '.*-g[0-9a-f]*$' >/dev/null && {
            echo >&2 "You are on 'snap' but $v is not an official version."
            exit 1
        }
-       d="prefix=$HOME/git-snap-$v"
+       prefix="$HOME/git-snap-$v"
        ;;
 *)
-       d="prefix=$HOME/git-test gitexecdir=\$(prefix)/libexec/git-core" ;;
+       prefix="$HOME/git-test" ;;
 esac
+d="prefix=$prefix"
 
 : ${O=-O2}
 
@@ -71,7 +73,7 @@ sh -c 'git describe --abbrev=4 HEAD' >/dev/null 2>&1 || {
 make $d \
      GITWEB_CONFIG=$G \
      PYTHON_PATH=/usr/bin/python2.4 \
-     ETC_GITCONFIG=$d/etc/gitconfig \
+     ETC_GITCONFIG=$prefix/etc/gitconfig \
      CFLAGS="$O -Wall -Wdeclaration-after-statement -g" \
      "$@"
 status=$?