[zaptel-commits] qwell: trunk r2528 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: qwell
Date: Thu May 17 13:47:22 2007
New Revision: 2528

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2528
Log:
Merged revisions 2527 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2527 | qwell | 2007-05-17 13:46:28 -0500 (Thu, 17 May 2007) | 5 lines

Fix problem with chan_misdn not being built in Asterisk, due to missing suppserv.
Update to new tarballs from misdn.org and allow versioning in Makefile.

Issue 9064.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2528&r1=2527&r2=2528
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 17 13:47:22 2007
@@ -314,6 +314,8 @@
 stackcheck: checkstack $(BUILDVER)
 	./checkstack *.o
 
+MISDNVERSION=1_1_3
+MISDNUSERVERSION=1_1_3
 b410p:
 	@if test "$(DOWNLOAD)" = ":" ; then \
 		echo "**************************************************"; \
@@ -327,12 +329,12 @@
 		echo "**************************************************"; \
 		exit 1; \
 	fi
-	[ -f misdn-b410p.tar.gz ] || $(DOWNLOAD) ftp://ftp.digium.com/pub/zaptel/b410p/misdn-b410p.tar.gz
-	tar -zxf misdn-b410p.tar.gz
-	$(MAKE) -C misdn install
-	[ -f mISDNuser.tar.gz ] || $(DOWNLOAD) ftp://ftp.digium.com/pub/zaptel/b410p/mISDNuser.tar.gz
-	tar -zxf mISDNuser.tar.gz
-	$(MAKE) -C mISDNuser install
+	[ -f mISDN-$(MISDNVERSION).tar.gz ] || $(DOWNLOAD) ftp://ftp.digium.com/pub/zaptel/b410p/mISDN-$(MISDNVERSION).tar.gz
+	tar -zxf mISDN-$(MISDNVERSION).tar.gz
+	$(MAKE) -C mISDN-$(MISDNVERSION) install
+	[ -f mISDNuser-$(MISDNUSERVERSION).tar.gz ] || $(DOWNLOAD) ftp://ftp.digium.com/pub/zaptel/b410p/mISDNuser-$(MISDNUSERVERSION).tar.gz
+	tar -zxf mISDNuser-$(MISDNUSERVERSION).tar.gz
+	$(MAKE) -C mISDNuser-$(MISDNUSERVERSION) install
 
 $(UTILS): %: %.o
 	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)