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

[zaptel-commits at lists.digium.com]

Author: file
Date: Sun Aug 27 17:58:52 2006
New Revision: 1369

URL: http://svn.digium.com/view/zaptel?rev=1369&view=rev
Log:
Merged revisions 1368 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1368 | file | 2006-08-27 18:58:06 -0400 (Sun, 27 Aug 2006) | 2 lines

Copy the firmware from the new location

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sun Aug 27 17:58:52 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317,1327,1359,1362-1363
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298,1300,1304,1306,1311,1313,1315,1317,1327,1359,1362-1363,1368

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1369&r1=1368&r2=1369&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 27 17:58:52 2006
@@ -425,9 +425,9 @@
 firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
-		install -m 644 *.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
 	elif [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
-		install -m 644 *.ima $(INSTALL_PREFIX)/lib/firmware; \
+		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else