[Freeswitch-svn] [commit] r2896 - in freeswitch/trunk: . build

[Freeswitch SVN]

Author: anthm
Date: Sat Sep 30 03:44:25 2006
New Revision: 2896

Modified:
   freeswitch/trunk/Makefile.am
   freeswitch/trunk/Makefile.in
   freeswitch/trunk/build/checkversion.sh

Log:
fix checkversion on Freebsd, another hardcoded make

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Sat Sep 30 03:44:25 2006
@@ -142,10 +142,10 @@
 
 
 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:

Modified: freeswitch/trunk/Makefile.in
==============================================================================
--- freeswitch/trunk/Makefile.in	(original)
+++ freeswitch/trunk/Makefile.in	Sat Sep 30 03:44:25 2006
@@ -1072,10 +1072,10 @@
 
 
 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:

Modified: freeswitch/trunk/build/checkversion.sh
==============================================================================
--- freeswitch/trunk/build/checkversion.sh	(original)
+++ freeswitch/trunk/build/checkversion.sh	Sat Sep 30 03:44:25 2006
@@ -16,5 +16,12 @@
 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