Meta/Make: minimum adjustment for BSD environment
Junio C Hamano committed
May 7, 2009 at 21:43 UTC
6f5eea980edc0c4a4b07ae48963213af8208c92b
1 file changed
+13
-6
Make
+13
-6
index 35ac488832..f5daff751f 100755
--- a/Make
+++ b/Make
@@ -1,7 +1,5 @@
#!/bin/sh
-G=/opt/packrat/playpen/public/in-place/git/index/gitweb_config.perl
-
case "$(git version 2>/dev/null)" in
"git version"*)
GIT=git ;;
@@ -101,13 +99,22 @@ sh -c 'git describe --abbrev=4 HEAD' >/dev/null 2>&1 || {
d="$d ASCIIDOC_NO_ROFF=YesPlease ASCIIDOC8=YesPlease"
+# Platform hack
+if test -z "${make:+set}" && test -x /usr/local/bin/gmake
+then
+ make=gmake
+fi
+
CFLAGS="$O $Wall -g"
+OK_TO_USE_CFLAGS=Yes
+if test -n "${NO_CFLAGS+set}"
+then
+ unset OK_TO_USE_CFLAGS
+fi
-make $d \
- GITWEB_CONFIG=$G \
- PYTHON_PATH=/usr/bin/python2.4 \
+${make-make} $d \
ETC_GITCONFIG=$prefix/etc/gitconfig \
- CFLAGS="$CFLAGS" \
+ ${OK_TO_USE_CFLAGS+"CFLAGS=$CFLAGS"} \
${tests:+"T=$tests"} \
"$@"
status=$?