[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  22f034a307bf0ccdf63bba6aa0f72f8dbcba69c9 (commit)
      from  6593097586fb134cf399d6d954202ce92b5f94ec (commit)

Summary of changes:
 drivers/dahdi/firmware/Makefile |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit 22f034a307bf0ccdf63bba6aa0f72f8dbcba69c9
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Sun Mar 30 19:55:17 2014 +0300

    firmware: Honor DESTDIR when installing firmware.
    
    This fixes a regression introduced first in release 2.9.1 with commit
    (7ce849846502ff9d "firmware: Refactor by using build_tools/install_firmware.")
    which prevents from installing the firmware in a location other than the system
    root.
    
    Bug: https://issues.asterisk.org/jira/browse/DAHLIN-337
    Reported-by: Anthony Messina <amessina at messinet.com>
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
    [edited the commit message]
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>

diff --git a/drivers/dahdi/firmware/Makefile b/drivers/dahdi/firmware/Makefile
index 6840f4a..a019bfd 100644
--- a/drivers/dahdi/firmware/Makefile
+++ b/drivers/dahdi/firmware/Makefile
@@ -83,6 +83,7 @@ OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032.o)
 DOWNLOAD=wget
 WGET=wget
 INSTALL_FIRMWARE=../../../build_tools/install_firmware
+RUN_INST=$(INSTALL_FIRMWARE) $(1) $(2) $(DESTDIR)
 
 # If "fetch" is used, --continue is not a valid option.
 ifeq ($(WGET),wget)
@@ -126,21 +127,21 @@ $(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)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-032 $(OCT6114_032_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-064 $(OCT6114_064_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-128 $(OCT6114_128_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-oct6114-256 $(OCT6114_256_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-tc400m $(TC400M_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-hx8 $(HX8_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-vpmoct032 $(VPMOCT032_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te820 $(WCT820_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te133 $(TE133_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te134 $(TE134_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-te435 $(TE435_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a8a $(A8A_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a8b $(A8B_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a4a $(A4A_VERSION)
-	@$(INSTALL_FIRMWARE) dahdi-fw-a4b $(A4B_VERSION)
+	@$(call RUN_INST,dahdi-fw-oct6114-032,$(OCT6114_032_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-064,$(OCT6114_064_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-128,$(OCT6114_128_VERSION))
+	@$(call RUN_INST,dahdi-fw-oct6114-256,$(OCT6114_256_VERSION))
+	@$(call RUN_INST,dahdi-fw-tc400m,$(TC400M_VERSION))
+	@$(call RUN_INST,dahdi-fw-hx8,$(HX8_VERSION))
+	@$(call RUN_INST,dahdi-fw-vpmoct032,$(VPMOCT032_VERSION))
+	@$(call RUN_INST,dahdi-fw-te820,$(WCT820_VERSION))
+	@$(call RUN_INST,dahdi-fw-te133,$(TE133_VERSION))
+	@$(call RUN_INST,dahdi-fw-te134,$(TE134_VERSION))
+	@$(call RUN_INST,dahdi-fw-te435,$(TE435_VERSION))
+	@$(call RUN_INST,dahdi-fw-a8a,$(A8A_VERSION))
+	@$(call RUN_INST,dahdi-fw-a8b,$(A8B_VERSION))
+	@$(call RUN_INST,dahdi-fw-a4a,$(A4A_VERSION))
+	@$(call RUN_INST,dahdi-fw-a4b,$(A4B_VERSION))
 
 # Uninstall any installed dahdi firmware images from hotplug firmware directories
 hotplug-uninstall:

-----------------------------------------------------------------------


-- 
dahdi/linux.git