From 13685d47b5dee607c722308c8e630535dc90f99f Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Fri, 17 Aug 2007 12:41:47 +0000
Subject: * Re-introduce the target install-include . * programs and
 install-programs are now for all of userspace.   Added the target 'utils' 
 for what 'programs' used to be. * Document this. * Document some other
 variations on 'make' and 'make install'. * Improve documentation of
 /proc/zaptel . * Ignoring some more utilities.

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f69df2c..b4efbca 100644
--- a/Makefile
+++ b/Makefile
@@ -170,6 +170,7 @@ ifneq (,$(INITRD_DIR))
   INIT_TARGET	:= $(DESTDIR)$(INITRD_DIR)/zaptel
   COPY_INITD	:= install -D zaptel.init $(INIT_TARGET)
 endif
+RCCONF_DIR	:= $(firstword $(wildcard /etc/sysconfig /etc/default))
 
 NETSCR_DIR	:= $(firstword $(wildcard /etc/sysconfig/network-scripts ))
 ifneq (,$(NET_SCR_DIR))
@@ -408,7 +409,9 @@ install: all devices install-modules install-libs firmware
 	@echo "###"
 	@echo "###################################################"
 
-install-programs: programs
+install-programs: install-utils install-libs install-include
+
+install-utils:
 	install -d $(DESTDIR)$(SBINDIR)
 	install -m 755 $(BINS) $(DESTDIR)$(SBINDIR)
 ifneq (,$(wildcard sethdlc-new))
@@ -420,8 +423,6 @@ else
 endif
 	install -d                  $(DESTDIR)$(MANDIR)
 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MANDIR)
-	install -d $(DESTDIR)$(INCLUDE_DIR)/linux
-	install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/
 ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
 	install -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
@@ -467,6 +468,10 @@ ifneq (,$(SELINUX_ENABLED))
 	/sbin/restorecon -v $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
 endif
 
+install-include:
+	install -d $(DESTDIR)$(INCLUDE_DIR)/linux
+	install -m 644 zaptel.h torisa.h $(DESTDIR)$(INCLUDE_DIR)/linux/
+
 install-udev: devices
 
 # FIRMWARE_DIR also implies HOTPLUG_FIRMWARE, unless set manually.
@@ -489,14 +494,9 @@ config:
 ifneq (,$(COPY_INITD))
 	$(COPY_INITD)
 endif
-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
+ifneq (,$(RCCONF_DIR))
+  ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel))
+	$(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
   endif
 endif
 ifneq (,$(COPY_NETSCR))
-- 
cgit v1.2.3