From e9d5418b18242bcae65d16a9d32c60e4b4ded679 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Wed, 31 May 2006 10:46:46 +0000 Subject: [PATCH] 0.9.13.12: GNU make finding tweak * Try "make" before "gmake": should not (hopefully!) break anything, and makes build work out of the box on MSYS when Cygwin is installed and in PATH. --- find-gnumake.sh | 4 ++-- version.lisp-expr | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/find-gnumake.sh b/find-gnumake.sh index 1446ab2..38819f7 100644 --- a/find-gnumake.sh +++ b/find-gnumake.sh @@ -6,14 +6,14 @@ find_gnumake() { if [ "$GNUMAKE" != "" ] ; then # The user is evidently trying to tell us something. GNUMAKE="$GNUMAKE" + elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then + GNUMAKE=make elif [ -x "`which gmake`" ] ; then # "gmake" is the preferred name in *BSD. GNUMAKE=gmake elif [ -x "`which gnumake`" ] ; then # MacOS X aka Darwin GNUMAKE=gnumake - elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then - GNUMAKE=make else echo "GNU Make not found. Try setting the environment variable GNUMAKE." exit 1 diff --git a/version.lisp-expr b/version.lisp-expr index 5cf5787..c808f63 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.13.11" +"0.9.13.12" -- 1.7.10.4