diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 19:05:43 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 19:05:43 +0000 |
| commit | 4e842bd27970828aad4dd6cac9e2943870ac85a9 (patch) | |
| tree | 00f7fde902f2f5ec8724ffc07f0a3c97cc0d675b /Makefile | |
| parent | ab2555f5438340ba23ec748cdd8c23d1a302702b (diff) | |
revert some 'grep -q' changes that were wrong (oops)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1066 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -61,7 +61,7 @@ endif 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 @@ endif $(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 @@ update: 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 @@ update: 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 \ |