diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-09-08 20:34:15 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-09-08 20:34:15 +0000 |
| commit | 44d3c90d25a9e68b4966d582c3e3fba7e261c445 (patch) | |
| tree | 8e0ab75ef843506646e52dbfcea2042f8df79765 | |
| parent | 3fe6c88543738151dcf420903ad151aadf0f1b82 (diff) | |
Fix hotplug-install when firmware is disabled from menuselect. Closes issue #13399
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4513 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | firmware/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 710572d..88def15 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -87,6 +87,7 @@ $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware: # 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 @@ ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-0 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 @@ ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-1 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 @@ ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$( 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 @@ -131,6 +138,7 @@ ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032 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 hotplug-uninstall: |