[zaptel-commits] trunk r1237 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: file
Date: Sat Jul 15 19:16:54 2006
New Revision: 1237

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

........
r1236 | file | 2006-07-15 19:16:13 -0500 (Sat, 15 Jul 2006) | 2 lines

Minor Makefile adjustment for installing the firmware

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sat Jul 15 19:16:54 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
+/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,1236

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1237&r1=1236&r2=1237&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Jul 15 19:16:54 2006
@@ -426,9 +426,9 @@
 firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	if [ -d /usr/lib/hotplug/firmware ]; then \
-		install -D -m 644 *.ima /usr/lib/hotplug/firmware ; \
+		install -m 644 *.ima /usr/lib/hotplug/firmware; \
 	elif [ -d /lib/firmware ]; then \
-		install -D -m 644 *.ima /lib/firmware ; \
+		install -m 644 *.ima /lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else