[Asterisk-cvs] asterisk Makefile,1.129,1.130

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv16704

Modified Files:
	Makefile 
Log Message:
Fix mpg123 build on non-linux (bug #3385)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- Makefile	17 Jan 2005 04:48:51 -0000	1.129
+++ Makefile	20 Jan 2005 16:22:59 -0000	1.130
@@ -38,6 +38,7 @@
 OPTIONS+=-fomit-frame-pointer
 endif
 
+MPG123TARG=linux
 endif
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -151,11 +152,13 @@
 LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 INCLUDE+=-I/usr/local/include
 CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
+MPG123TARG=freebsd
 endif # FreeBSD
 
 ifeq (${OSARCH},NetBSD)
 CFLAGS+=-pthread
 INCLUDE+=-I/usr/local/include -I/usr/pkg/include
+MPG123TARG=netbsd
 endif
 
 ifeq (${OSARCH},OpenBSD)
@@ -334,7 +337,7 @@
 	rm -f ast_expr.c
 	rm -f .version
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
-	@if [ -d mpg123-0.59r ]; then make -C mpg123-0.59r clean; fi
+	@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
@@ -429,7 +432,7 @@
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
 	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
-	if [ -f mpg123-0.59r/mpg123 ]; then make -C mpg123-0.59r install; fi
+	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 	@echo " +---- Asterisk Installation Complete -------+"  
 	@echo " +                                           +"
 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -555,7 +558,7 @@
 	@wget -V >/dev/null || (echo "You need wget" ; false )
 	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
 	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
-	make -C mpg123-0.59r linux
+	$(MAKE) -C mpg123-0.59r $(MPG123TARG)
 
 config:
 	if [ -d /etc/rc.d/init.d ]; then \
@@ -579,7 +582,7 @@
 FORCE:
 
 %_env:
-	make -C $(shell echo $@ | sed "s/_env//g") env
+	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
 
 env:
 	env
@@ -591,6 +594,6 @@
 
 cleantest:
 	if ! cmp -s .cleancount .lastclean ; then \
-		make clean; cp -f .cleancount .lastclean;\
+		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi