From 459cb1c4dad01e36aee5981deb56f0610f033d88 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 1 Jul 2008 20:49:48 +0000 Subject: revert this... all of this stuff belongs in dahdi-tools git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4502 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3cc1e99..62df857 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,7 @@ ifdef INITRD_DIR INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/dahdi COPY_INITD := install -D dahdi.init $(INIT_TARGET) endif +RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default)) NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts )) ifdef NETSCR_DIR @@ -198,23 +199,25 @@ install-modules: modules [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : config: - install -d $(DESTDIR)/etc/dahdi - install -D -m 644 system.conf.sample $(DESTDIR)/etc/dahdi/system.conf ifdef COPY_INITD $(COPY_INITD) - install -D -m 644 init.conf.sample $(DESTDIR)/etc/dahdi/init.conf -ifdef ADD_INITD - $(ADD_INITD) endif +ifdef RCCONF_DIR + ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/dahdi)) + install -D -m 644 dahdi.sysconfig $(DESTDIR)$(RCCONF_DIR)/dahdi + endif endif ifdef COPY_NETSCR $(COPY_NETSCR) +endif +ifdef ADD_INITD + $(ADD_INITD) endif @echo "DAHDI has been configured." @echo "" @echo "If you have any DAHDI hardware it is now recommended to " - @echo "edit /etc/dahdi/init.conf and set an optimal value for" - @echo " the variable MODULES." + @echo "edit /etc/default/dahdi or /etc/sysconfig/dahdi and set there an " + @echo "optimal value for the variable MODULES." @echo "" @echo "I think that the DAHDI hardware you have on your system is:" @kernel/xpp/utils/dahdi_hardware || true -- cgit v1.2.3