[svn-commits] tzafrir: tools/trunk r4543 - in /tools/trunk: Makefile doc/system.conf

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun Jul  6 05:37:16 2008
New Revision: 4543

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4543
Log:
* Copied over the old zaptel.conf sample as doc/system.conf .
* Fixed installation of system.conf and man pages in main Makefile.

Added:
    tools/trunk/doc/system.conf
      - copied unchanged from r4365, old/branches/1.4/zaptel.conf.sample
Modified:
    tools/trunk/Makefile

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4543&r1=4542&r2=4543
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Sun Jul  6 05:37:16 2008
@@ -91,6 +91,8 @@
 LIB_DIR:=$(libdir)
 INC_DIR:=$(includedir)/dahdi
 MAN_DIR:=$(mandir)/man8
+CONFIG_DIR:=$(sysconfdir)/dahdi
+CONFIG_FILE:=$(CONFIG_DIR)/system.conf
 
 # Utilities we build with a standard build procedure:
 UTILS		= dahdi_tool dahdi_test dahdi_monitor dahdi_speed sethdlc dahdi_cfg \
@@ -178,7 +180,7 @@
 		print (($$1 eq "country")? "* $$2\t":"$$2\n");' $<  \
 	>$@
 
-system.conf.asciidoc: system.conf.sample
+system.conf.asciidoc: doc/system.conf
 	perl -n -e \
 		'if (/^#($$|\s)(.*)/){ if (!$$in_doc){print "\n"}; $$in_doc=1; print "$$2\n" } else { if ($$in_doc){print "\n"}; $$in_doc=0; print "  $$_" }' \
 		$< >$@
@@ -217,11 +219,11 @@
 ifneq (,$(BINS))
 	install -d $(DESTDIR)$(BIN_DIR)
 	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
-#	install -d $(DESTDIR)$(MAN_DIR)
-#	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
+	install -d $(DESTDIR)$(MAN_DIR)
+	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
 endif
 ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
-#	$(INSTALL) -D -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
+	$(INSTALL) -D -m 644 doc/system.conf $(DESTDIR)$(CONFIG_FILE)
 endif
 
 install-libs: libs