From 882c00d61526982015de71f82dadbd13956de03f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 30 Sep 2006 07:44:25 +0000 Subject: [PATCH] fix checkversion on Freebsd, another hardcoded make git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2896 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- build/checkversion.sh | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 914d19deeb..3fad474e5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,10 +142,10 @@ freeswitch_LDADD = ${top_builddir}/libfreeswitch.la version: Makefile src/include/switch_version.h - ./build/checkversion.sh + MAKE=$(MAKE) ./build/checkversion.sh newversion: Makefile - ./build/checkversion.sh force + MAKE=$(MAKE) ./build/checkversion.sh force $(MAKE) .nodepends: diff --git a/Makefile.in b/Makefile.in index 692cb3dd5d..6a40c2392a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1072,10 +1072,10 @@ uninstall-info: uninstall-info-recursive version: Makefile src/include/switch_version.h - ./build/checkversion.sh + MAKE=$(MAKE) ./build/checkversion.sh newversion: Makefile - ./build/checkversion.sh force + MAKE=$(MAKE) ./build/checkversion.sh force $(MAKE) .nodepends: diff --git a/build/checkversion.sh b/build/checkversion.sh index f17be108c5..787ba5dccc 100755 --- a/build/checkversion.sh +++ b/build/checkversion.sh @@ -16,5 +16,12 @@ grep "@SVN_VERSION@" src/include/switch_version.h && force=1 if [ $oldversion != $version ] || [ $force = 1 ] ; then cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$version/g" > src/include/switch_version.h echo $version > .version - make modclean + if [ -z "$MAKE" ] ; then + make=`which gmake 2>/dev/null` + if [ -z "$MAKE" ] ; then + make=make + fi + fi + + $MAKE modclean fi