Author: tzafrir
Date: Sun Jul 22 12:41:16 2007
New Revision: 2771
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2771
Log:
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 .
Modified:
branches/1.2/Makefile
Modified: branches/1.2/Makefile
URL:
http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2771&r1=2770&r2=2771
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Jul 22 12:41:16 2007
@@ -155,15 +155,6 @@
ifneq (,$(NET_SCR_DIR))
NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
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"})
@@ -491,8 +482,15 @@
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 @@
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
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
