Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# 41349

Browse Source 
r = cls, a = brendan
OS/2 bring-up - Our bash shell can't handle lines with the : command - cls said to comment them out


git-svn-id: svn://10.0.0.236/trunk@71849 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2000-06-09 01:21:45 +00:00
parent 67459a033a
commit f1de2d2de1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/client.mk
View File

@ -262,7 +262,7 @@ everything: checkout clean build
# CVS checkout
#
checkout::
@: Backup the last checkout log.
# @: Backup the last checkout log.
@if test -f $(CVSCO_LOGFILE) ; then \
mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
else true; \
@ -274,8 +274,8 @@ checkout::
$(MAKE) -f mozilla/client.mk real_checkout
real_checkout:
@: Start the checkout. Split the output to the tty and a log file. \
: If it fails, touch an error file because "tee" hides the error.
# @: Start the checkout. Split the output to the tty and a log file. \
# : If it fails, touch an error file because "tee" hides the error.
@failed=.cvs-failed.tmp; rm -f $$failed*; \
cvs_co() { echo "$$@" ; \
("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
@ -285,7 +285,7 @@ real_checkout:
cvs_co $(CVSCO_LDAPCSDK) && \
cvs_co $(CVSCO_SEAMONKEY)
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
@: Check the log for conflicts. ;\
# @: Check the log for conflicts. ;\
conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
if test "$$conflicts" ; then \
echo "$(MAKE): *** Conflicts during checkout." ;\