[svn-commits] file: branch 1.4 r1500 - in /branches/1.4: ./ Makefile

[svn-commits at lists.digium.com]

Author: file
Date: Wed Oct 11 12:25:16 2006
New Revision: 1500

URL: http://svn.digium.com/view/zaptel?rev=1500&view=rev
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/Makefile

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?rev=1500&r1=1499&r2=1500&view=diff
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Oct 11 12:25:16 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