Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv4361
Modified Files:
Makefile
Log Message:
only attempt to run chkconfig if we can find it (bug #3955)
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/zaptel/Makefile,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- Makefile 4 Feb 2005 05:55:51 -0000 1.69
+++ Makefile 5 Apr 2005 04:12:12 -0000 1.70
@@ -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
@@ -315,7 +319,6 @@
if ! grep "alias char-major-196" $(MODCONF); then \
echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
fi
-
for x in $(MODULES); do \
if ! grep -q "post-install $$x" $(MODCONF); then \
if ! grep -q "install $$x " $(MODCONF); then \
@@ -340,10 +343,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 [ -d /etc/default ] && [ ! -f /etc/default/zaptel ]; then \
install -D -m 644 zaptel.sysconfig
$(INSTALL_PREFIX)/etc/default/zaptel; \
@@ -362,7 +365,7 @@
else \
echo "Not CVS"; \
fi
-
+
clean:
rm -f torisatool makefw tor2fw.h radfw.h
rm -f ${BINS}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
