[zaptel-commits] branch group/menuselect r1178 - /team/group/menuselect/Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Mon Jun 26 09:10:48 2006
New Revision: 1178

URL: http://svn.digium.com/view/zaptel?rev=1178&view=rev
Log:
minor cleanups

Modified:
    team/group/menuselect/Makefile

Modified: team/group/menuselect/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/menuselect/Makefile?rev=1178&r1=1177&r2=1178&view=diff
==============================================================================
--- team/group/menuselect/Makefile (original)
+++ team/group/menuselect/Makefile Mon Jun 26 09:10:48 2006
@@ -98,16 +98,11 @@
   BUILDVER:=linux26
 endif
 
-# Prevent some errors from occuring before configure is executed
-ifeq ($(GREP),)
-GREP=grep
-endif
-
 # This is not related to the version that we build. Rather, to the 
 # version that we runs. If we build for 2.4 using 2.4 headers on a 2.6
 # system with udev mounted on /dev , no point in installing files to /dev
 # because they'll be wiped at next reboot.
-DYNFS:=$(shell ps ax | $(GREP) -v grep | $(GREP) -qw 'devfsd\|udevd' && echo "yes")
+DYNFS:=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes")
 
 # Check for udev rules directories
 ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
@@ -392,13 +387,13 @@
 	$(LN) -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
 	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
-	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel.h
-	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/torisa.h
+	$(INSTALL) -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel.h
+	$(INSTALL) -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/torisa.h
 	rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
 	rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
-	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
-	install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+	$(INSTALL) -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+	$(INSTALL) -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+	$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
 	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 	[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
 	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"