diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 22:26:53 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 22:26:53 +0000 |
| commit | 8647a60f08ee0992756b9b23b4cfc9dd6302b040 (patch) | |
| tree | 6b6f96a16006e7136d3222a6cf3990fcfe2e1262 /Makefile | |
| parent | e305cd37410beb39410b42d787919f9406a8f860 (diff) | |
fix more buglets from my recent cleanups
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1071 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -367,7 +367,7 @@ update: echo "Updating from Subversion..." ; \ svn update | tee update.out; \ rm -f .version; \ - if [ `grep -q -c ^C update.out` -gt 0 ]; then \ + if [ `grep -c ^C update.out` -gt 0 ]; then \ echo ; echo "The following files have conflicts:" ; \ grep ^C update.out | cut -b4- ; \ fi ; \ @@ -376,7 +376,7 @@ update: echo "Updating from CVS..." ; \ cvs -q -z3 update -Pd | tee update.out; \ rm -f .version; \ - if [ `grep -q -c ^C update.out` -gt 0 ]; then \ + if [ `grep -c ^C update.out` -gt 0 ]; then \ echo ; echo "The following files have conflicts:" ; \ grep ^C update.out | cut -d' ' -f2- ; \ fi ; \ |