[asterisk-commits] murf: branch murf/bug7804 r41149 - in /team/murf/bug7804: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Aug 25 15:36:00 2006
New Revision: 41149

URL: http://svn.digium.com/view/asterisk?rev=41149&view=rev
Log:
Merged revisions 41147 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r41147 | rizzo | 2006-08-25 14:10:56 -0600 (Fri, 25 Aug 2006) | 5 lines

we really need BSD make here to understand the -V option.
Fix and document this.
(problem introduced in SVN 40753)


........

Modified:
    team/murf/bug7804/   (props changed)
    team/murf/bug7804/Makefile

Propchange: team/murf/bug7804/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 25 15:36:00 2006
@@ -1,1 +1,1 @@
-/trunk:1-41134
+/trunk:1-41148

Modified: team/murf/bug7804/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug7804/Makefile?rev=41149&r1=41148&r2=41149&view=diff
==============================================================================
--- team/murf/bug7804/Makefile (original)
+++ team/murf/bug7804/Makefile Fri Aug 25 15:36:00 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