diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-27 19:12:22 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-27 19:12:22 +0000 |
| commit | 7e67a7f820d47dee9c2c302962732a6fa814ac1e (patch) | |
| tree | afafdcb498e15681173ccfa549e44fc266d4b484 /Makefile | |
| parent | d81ae4dfddeaed7d9b74824b77be79d6ed8140a2 (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |