From 7e67a7f820d47dee9c2c302962732a6fa814ac1e Mon Sep 17 00:00:00 2001 From: qwell Date: Fri, 27 Jul 2007 19:12:22 +0000 Subject: Fix a few bothersome Makefile issues I ran into while trying to `make install` git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2784 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 39e6a61..20f8337 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ ifneq (,$(NET_SCR_DIR)) 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 @@ firmware: 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 -- cgit v1.2.3