[svn-commits] rizzo: trunk r41147 - /trunk/Makefile

svn-commits at lists.digium.com svn-commits at lists.digium.com
Fri Aug 25 13:10:57 MST 2006


Author: rizzo
Date: Fri Aug 25 15:10:56 2006
New Revision: 41147

URL: http://svn.digium.com/view/asterisk?rev=41147&view=rev
Log:
we really need BSD make here to understand the -V option.
Fix and document this.
(problem introduced in SVN 40753)


Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=41147&r1=41146&r2=41147&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Aug 25 15:10:56 2006
@@ -163,7 +163,8 @@
 endif
 
 ifeq ($(OSARCH),FreeBSD)
-  BSDVERSION=$(shell $(MAKE) -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+  # -V is understood by BSD Make, not by GNU make.
+  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 endif



More information about the svn-commits mailing list