[svn-commits] dlee: trunk r423283 - in /trunk: ./ Makefile makeopts.in

[SVN commits to the Digium repositories]

Author: dlee
Date: Thu Sep 18 10:07:12 2014
New Revision: 423283

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423283
Log:
Only install dahdi_span_config_hook if DAHDI is enabled

This patch changes the install to only install the hook script if
DAHDI is enabled. It also adds the script to the uninstall task, and
moves the DAHDI_UDEV_HOOK_DIR variable so that it's not between the
_MAKEOPTS variables and their comment.

This allows installs which specify a --prefix to work normally, as
long as they don't enable DAHDI.

Review: https://reviewboard.asterisk.org/r/3972/
........

Merged revisions 423281 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/makeopts.in

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=423283&r1=423282&r2=423283
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Sep 18 10:07:12 2014
@@ -151,13 +151,14 @@
 # Uncomment this to use the older DSP routines
 #_ASTCFLAGS+=-DOLD_DSP_ROUTINES
 
+# Default install directory for DAHDI hooks.
+DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
+
 # If the file .asterisk.makeopts is present in your home directory, you can
 # include all of your favorite menuselect options so that every time you download
 # a new version of Asterisk, you don't have to run menuselect to set them.
 # The file /etc/asterisk.makeopts will also be included but can be overridden
 # by the file in your home directory.
-
-DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
 
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
@@ -591,8 +592,10 @@
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
 		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
 	fi
+ifeq ($(HAVE_DAHDI),1)
 	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
 	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
+endif
 
 $(SUBDIRS_INSTALL):
 	+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
@@ -870,6 +873,9 @@
 	rm -f "$(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8"
 	rm -f "$(DESTDIR)$(ASTMANDIR)/man8/autosupport.8"
 	rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
+ifeq ($(HAVE_DAHDI),1)
+	rm -f $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
+endif
 	$(MAKE) -C sounds uninstall
 
 uninstall: _uninstall

Modified: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=423283&r1=423282&r2=423283
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Thu Sep 18 10:07:12 2014
@@ -305,6 +305,7 @@
 VPB_INCLUDE=@VPB_INCLUDE@
 VPB_LIB=@VPB_LIB@
 
+HAVE_DAHDI=@PBX_DAHDI@
 DAHDI_INCLUDE=@DAHDI_INCLUDE@
 
 ZLIB_INCLUDE=@ZLIB_INCLUDE@