[Asterisk-cvs] zaptel Makefile,1.69,1.70
kpfleming at lists.digium.com
kpfleming at lists.digium.com
Mon Apr 4 23:19:23 CDT 2005
- Previous message: [Asterisk-cvs] libpri libpri.h, 1.45, 1.46 pri.c, 1.33,
1.34 pri_facility.c, 1.7, 1.8 pri_facility.h, 1.3,
1.4 pri_internal.h, 1.18, 1.19 q931.c, 1.121, 1.122
- Next message: [Asterisk-cvs] asterisk say.c,1.53,1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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}
- Previous message: [Asterisk-cvs] libpri libpri.h, 1.45, 1.46 pri.c, 1.33,
1.34 pri_facility.c, 1.7, 1.8 pri_facility.h, 1.3,
1.4 pri_internal.h, 1.18, 1.19 q931.c, 1.121, 1.122
- Next message: [Asterisk-cvs] asterisk say.c,1.53,1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the svn-commits
mailing list