[svn-commits] qwell: branch 1.2 r2784 - /branches/1.2/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Jul 27 14:12:22 2007
New Revision: 2784

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2784
Log:
Fix a few bothersome Makefile issues I ran into while trying to `make install`

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2784&r1=2783&r2=2784
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Jul 27 14:12:22 2007
@@ -157,7 +157,7 @@
   COPY_NETSCR	:= install -D ifup-hdlc $(NETSCR_TARGET)
 endif
 
-SELINUX_ENABLED	:= $(shell  [ -x /usr/sbin/sestatus ] && {/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"})
+SELINUX_ENABLED	:= $(shell  [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"))
 
 ifneq ($(wildcard .version),)
   ZAPTELVERSION:=$(shell cat .version)
@@ -467,11 +467,11 @@
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
 		install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/usr/lib/hotplug/firmware; \
-		install -m 644 wctdm24xxp/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+		install -m 644 wctdm24xxp/*.bin $(DESTDIR)/usr/lib/hotplug/firmware; \
 	fi
 	if [ -d $(DESTDIR)/lib/firmware ]; then \
 		install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/lib/firmware; \
-		install -m 644 wctdm24xxp/*.bin $(INSTALL_PREFIX)/lib/firmware; \
+		install -m 644 wctdm24xxp/*.bin $(DESTDIR)/lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else