[zaptel-commits] file: trunk r1501 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: file
Date: Wed Oct 11 12:27:07 2006
New Revision: 1501

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

................
r1500 | file | 2006-10-11 13:25:16 -0400 (Wed, 11 Oct 2006) | 10 lines

Merged revisions 1499 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1499 | file | 2006-10-11 13:22:10 -0400 (Wed, 11 Oct 2006) | 2 lines

Copy to both directories, not just the first one.

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Oct 11 12:27:07 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490
+/branches/1.4:1-1471,1490,1500

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1501&r1=1500&r2=1501&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Oct 11 12:27:07 2006
@@ -425,9 +425,10 @@
 firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
-		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
-	elif [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
-		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/lib/firmware; \
+		$(INSTALL) -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+	fi
+	if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
+		$(INSTALL) -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else