[svn-commits] qwell: branch 1.4 r4513 - /branches/1.4/firmware/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Sep  8 15:34:15 2008
New Revision: 4513

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4513
Log:
Fix hotplug-install when firmware is disabled from menuselect.  Closes issue #13399

Modified:
    branches/1.4/firmware/Makefile

Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=4513&r1=4512&r2=4513
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Mon Sep  8 15:34:15 2008
@@ -87,6 +87,7 @@
 
 # Install all downloaded firmware images for hotplug usage
 hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE)
+ifneq ($(findstring zaptel-fw-oct6114-064,$(FIRMWARE)),)
 ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
 	@echo "Installing zaptel-fw-oct6114-064.bin to hotplug firmware directories"
 	@$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware
@@ -98,6 +99,8 @@
 else
 	@echo "Firmware zaptel-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)"
 endif
+endif
+ifneq ($(findstring zaptel-fw-oct6114-128,$(FIRMWARE)),)
 ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
 	@echo "Installing zaptel-fw-oct6114-128.bin to hotplug firmware directories"
 	@$(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware
@@ -109,6 +112,8 @@
 else
 	@echo "Firmware zaptel-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)"
 endif
+endif
+ifneq ($(findstring zaptel-fw-tc400m,$(FIRMWARE)),)
 ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
 	@echo "Installing zaptel-fw-tc400m.bin to hotplug firmware directories"
 	@$(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware
@@ -120,6 +125,8 @@
 else
 	@echo "Firmware zaptel-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)"
 endif
+endif
+ifneq ($(findstring zaptel-fw-vpmadt032,$(FIRMWARE)),)
 ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
 	@echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories"
 	@$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware
@@ -130,6 +137,7 @@
 	@touch $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION)
 else
 	@echo "Firmware zaptel-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)"
+endif
 endif
 
 # Uninstall any installed zaptel firmware images from hotplug firmware directories