[zaptel-commits] branch 1.2 r1066 - /branches/1.2/Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 17 14:05:43 2006
New Revision: 1066

URL: http://svn.digium.com/view/zaptel?rev=1066&view=rev
Log:
revert some 'grep -q' changes that were wrong (oops)

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1066&r1=1065&r2=1066&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed May 17 14:05:43 2006
@@ -61,7 +61,7 @@
 
 ifeq ($(BUILDVER),linux24)
 #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-DYNFS:=$(shell ps ax | grep -q -v grep | grep -q devfsd && echo "yes")
+DYNFS:=$(shell ps ax | grep -v grep | grep -q devfsd && echo "yes")
 endif
 
 ifeq ($(BUILDVER),linux26)
@@ -329,7 +329,7 @@
 		$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
 	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 -q "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
+	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/linux/zaptel.h
 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
@@ -369,7 +369,7 @@
 		rm -f .version; \
 		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
-			grep -q ^C update.out | cut -b4- ; \
+			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
 	elif [ -d CVS ]; then \
@@ -378,7 +378,7 @@
 		rm -f .version; \
 		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
-			grep -q ^C update.out | cut -d' ' -f2- ; \
+			grep ^C update.out | cut -d' ' -f2- ; \
 		fi ; \
 		rm -f update.out; \
 	else \