diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 22:30:46 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-05-17 22:30:46 +0000 |
commit | a1e04fa5457198a41d107c0e59f9781f760cf681 (patch) | |
tree | 0329d0510f66363284327fca74749aa4d93da707 /Makefile | |
parent | 10875af5cff7c80ab08160351774a5d7eb5ca2dd (diff) |
Merged revisions 1071 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1071 | kpfleming | 2006-05-17 17:26:53 -0500 (Wed, 17 May 2006) | 2 lines
fix more buglets from my recent cleanups
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1072 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -388,7 +388,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 ; \ @@ -397,7 +397,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 ; \ |