[svn-commits] kpfleming: linux/trunk r4502 - /linux/trunk/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul  1 15:49:48 2008
New Revision: 4502

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4502
Log:
revert this... all of this stuff belongs in dahdi-tools

Removed:
    linux/trunk/dahdi.init
    linux/trunk/init.conf.sample
    linux/trunk/system.conf.sample
Modified:
    linux/trunk/Makefile

Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4502&r1=4501&r2=4502
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Tue Jul  1 15:49:48 2008
@@ -94,6 +94,7 @@
   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 @@
 	[ `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
+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
-endif
-ifdef COPY_NETSCR
-	$(COPY_NETSCR)
 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