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

[zaptel-commits at lists.digium.com]

Author: file
Date: Thu Jul 27 10:08:22 2006
New Revision: 1249

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

........
r1248 | file | 2006-07-27 11:06:58 -0400 (Thu, 27 Jul 2006) | 2 lines

Use INSTALL_PREFIX when installing firmware (issue #7600 reported by jcollie)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Thu Jul 27 10:08:22 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
+/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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1249&r1=1248&r2=1249&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul 27 10:08:22 2006
@@ -422,10 +422,10 @@
 
 firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
-	if [ -d /usr/lib/hotplug/firmware ]; then \
-		install -m 644 *.ima /usr/lib/hotplug/firmware; \
-	elif [ -d /lib/firmware ]; then \
-		install -m 644 *.ima /lib/firmware; \
+	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
+		install -m 644 *.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+	elif [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
+		install -m 644 *.ima $(INSTALL_PREFIX)/lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else