[zaptel-commits] file: branch 1.2 r2750 - /branches/1.2/Makefile

[SVN commits to the Zaptel project]

Author: file
Date: Wed Jul 18 11:27:04 2007
New Revision: 2750

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2750
Log:
A distribution may have multiple directories for firmware and without knowing the proper one we have to copy the firmware into each. We can't just copy it into the first one found.

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2750&r1=2749&r2=2750
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Jul 18 11:27:04 2007
@@ -132,10 +132,6 @@
 
 # sample makefile "trace print"
 #tracedummy=$(shell echo ====== GOT HERE ===== >&2; echo >&2)
-
-ifeq ($(HOTPLUG_FIRMWARE),yes)
-FIRMWARE_DIR	:= $(firstword $(wildcard /usr/lib/hotplug/firmware /lib/firmware ))
-endif
 
 CHKCONFIG	:= $(wildcard /sbin/chkconfig)
 UPDATE_RCD	:= $(wildcard /usr/sbin/update-rc.d)
@@ -476,9 +472,13 @@
 
 # FIRMWARE_DIR also implies HOTPLUG_FIRMWARE, unless set manually.
 firmware:
-ifneq (,$(FIRMWARE_DIR))
-	install -d $(DESTDIR)$(FIRMWARE_DIR)
-	install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)$(FIRMWARE_DIR)
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+	if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
+		install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/usr/lib/hotplug/firmware; \
+	fi
+	if [ -d $(DESTDIR)/lib/firmware ]; then \
+		install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/lib/firmware; \
+	fi
 	@echo "Installed firmware"
 else
 	@echo "Not installing firmware because we are not using hotplug firmware"