[Asterisk-cvs] zaptel ChangeLog, 1.1.2.8, 1.1.2.9 Makefile, 1.52.2.8, 1.52.2.9

[russell at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv4807

Modified Files:
      Tag: v1-0
	ChangeLog Makefile 
Log Message:
look for chkconfig (bug #3955)


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/zaptel/ChangeLog,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- ChangeLog	31 Mar 2005 23:06:36 -0000	1.1.2.8
+++ ChangeLog	5 Apr 2005 05:39:48 -0000	1.1.2.9
@@ -1,4 +1,6 @@
  -- added some use counts to prevent kernel panics when improperly unloading modules
+ -- fixed a problem in the Makefile that would cause problems if the system did not
+    have 'chkconfig'
 zaptel 1.0.7
  -- Makefile
     -- An alias has been added so that you can load wcfxs with 'modprobe wctdm'.

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.52.2.8
retrieving revision 1.52.2.9
diff -u -d -r1.52.2.8 -r1.52.2.9
--- Makefile	1 Mar 2005 14:35:16 -0000	1.52.2.8
+++ Makefile	5 Apr 2005 05:39:48 -0000	1.52.2.9
@@ -50,6 +50,10 @@
 DYNFS=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
 endif
 
+CHKCONFIG=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
+ifeq ($(CHKCONFIG),)
+CHKCONFIG=:
+endif
 
 TZOBJS=zonedata.lo tonezone.lo
 LIBTONEZONE=libtonezone.so.1.0
@@ -298,7 +302,6 @@
 	if ! grep "alias char-major-196" $(MODCONF); then \
 		echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
 	fi
-		
 	for x in $(MODULES); do \
 		if ! grep "post-install $$x" $(MODCONF); then \
 			if ! grep "install $$x " $(MODCONF); then \
@@ -323,10 +326,10 @@
 config:
 	if [ -d $(INSTALL_PREFIX)/etc/rc.d/init.d ]; then \
 		install -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/rc.d/init.d/zaptel; \
-		chkconfig --add zaptel; \
+		$(CHKCONFIG) --add zaptel; \
 	elif [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
 		install -D -m 755 zaptel.init $(INSTALL_PREFIX)/etc/init.d/zaptel; \
-		chkconfig --add zaptel; \
+		$(CHKCONFIG) --add zaptel; \
 	fi 
 	if [ ! -f /etc/sysconfig/zaptel ]; then \
 		install -D -m 644 zaptel.sysconfig $(INSTALL_PREFIX)/etc/sysconfig/zaptel; \
@@ -334,7 +337,7 @@
 	if [ -d /etc/sysconfig/network-scripts ]; then \
 		install -D -m 755 ifup-hdlc $(INSTALL_PREFIX)/etc/sysconfig/network-scripts/ifup-hdlc; \
 	fi
-	
+
 clean:
 	rm -f torisatool makefw tor2fw.h
 	rm -f zttool