summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-04-05 05:39:48 +0000
committerrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-04-05 05:39:48 +0000
commiteb490254fb3436ae88acc2858e4214da2eb7301a (patch)
treec7a236f2b9f2eadf819393708fdb9ada454fa418
parent946bc0af1fe072099c6d6ee5b3f4a4dc6dbd8cad (diff)
look for chkconfig (bug #3955)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/v1-0@618 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-xChangeLog2
-rwxr-xr-xMakefile11
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d76c62f..d4b8276 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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'.
diff --git a/Makefile b/Makefile
index 4fe2ecb..d23e8f2 100755
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,10 @@ ifeq (${BUILDVER},linux26)
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 @@ install: all devices $(LIBTONEZONE)
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 @@ install: all devices $(LIBTONEZONE)
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 @@ config:
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