From 833bd1d30fac0895db2d7bb4789bce65f1470454 Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Sun, 22 Jul 2007 17:41:16 +0000
Subject: Revert initd config file installation to the greeddy one of before
 zaptel 1.2.19/1.4.4 - install on both /etc/default/zaptel and
 /etc/sysconfig/zaptel .

Closes #10257 .


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2771 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 Makefile | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a9a5dad..39e6a61 100644
--- a/Makefile
+++ b/Makefile
@@ -157,15 +157,6 @@ ifneq (,$(NET_SCR_DIR))
   COPY_NETSCR	:= install -D ifup-hdlc $(NETSCR_TARGET)
 endif
 
-RCCONF_DIR	:= $(firstword $(wildcard /etc/default /etc/sysconfig))
-ifneq (,$(RCCONF_DIR))
-  RCCONF_TARGET	:= $(DESTDIR)$(RCCONF_DIR)/zaptel
-  # Let's not step over an existing config file:
-  ifeq (,$(wildcard $(RCCONF_TARGET)))
-    COPY_RCCONF	:= install -D -m 644 zaptel.sysconfig $(RCCONF_TARGET)
-  endif
-endif
-
 SELINUX_ENABLED	:= $(shell  [ -x /usr/sbin/sestatus ] && {/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"})
 
 ifneq ($(wildcard .version),)
@@ -491,8 +482,15 @@ config:
 ifneq (,$(COPY_INITD))
 	$(COPY_INITD)
 endif
-ifneq (,$(COPY_RCCONF))
-	$(COPY_RCCONF)
+ifneq (,$(wildcard /etc/default))
+  ifeq (,$(wildcard $(DESTDIR)/etc/default/zaptel))
+	install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/default/zaptel
+  endif
+endif
+ifneq (,$(wildcard /etc/sysconfig))
+  ifeq (,$(wildcard $(DESTDIR)/etc/sysconfig/zaptel))
+	install -D -m 644 zaptel.sysconfig $(DESTDIR)/etc/sysconfig/zaptel
+  endif
 endif
 ifneq (,$(COPY_NETSCR))
 	$(COPY_NETSCR)
@@ -502,12 +500,10 @@ ifneq (,$(ADD_INITD))
 endif
 	@echo "Zaptel has been configured."
 	@echo ""
-ifneq (,$(COPY_RCCONF))
 	@echo "If you have any zaptel hardware it is now recommended to "
-	@echo "edit $(RCCONF_TARGET) and set there an optimal value for "
-	@echo "the variable MODULES ."
+	@echo "edit /etc/default/zaptel or /etc/sysconfig/zaptel and set there an "
+	@echo "optimal value for the variable MODULES ."
 	@echo ""
-endif
 	@echo "I think that the zaptel hardware you have on your system is:"
 	@xpp/utils/zaptel_hardware || true
 
-- 
cgit v1.2.3