[svn-commits] file: trunk r2149 - in /trunk: ./ firmware/Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Sat Feb 10 14:50:57 2007
New Revision: 2149

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2149
Log:
Merged revisions 2147 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2147 | file | 2007-02-10 15:43:18 -0500 (Sat, 10 Feb 2007) | 2 lines

Only attempt to install firmware to the hotplug directories if any was selected.

........

Modified:
    trunk/   (props changed)
    trunk/firmware/Makefile

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

Modified: trunk/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/firmware/Makefile?view=diff&rev=2149&r1=2148&r2=2149
==============================================================================
--- trunk/firmware/Makefile (original)
+++ trunk/firmware/Makefile Sat Feb 10 14:50:57 2007
@@ -78,12 +78,14 @@
 
 # Install all downloaded firmware images for hotplug usage and build headers for inclusion
 hotplug-install: $(FIRMWARE)
+ifneq (,$(FIRMWARE))
 	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
 		$(INSTALL) -m 644 zaptel-fw-*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
 	fi
 	if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
 		$(INSTALL) -m 644 zaptel-fw-*.bin $(INSTALL_PREFIX)/lib/firmware; \
 	fi
+endif
 
 # Uninstall any installed zaptel firmware images from hotplug firmware directories
 hotplug-uninstall: