d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow "make update" work with SVN, if you take the time to set up your

Browse Source 
/etc/make.conf properly.

Only one SCM?
I do not think this is right.
Now I have fixed it.
This commit is contained in:
Mark Murray 2009-06-14 15:16:24 +00:00
parent eea665c4be
commit 51a8ff0c9c
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.inc1
View File

@ -94,6 +94,8 @@ CLEANDIR= cleandir
CVS?= cvs
CVSFLAGS?= -A -P -d -I!
SVN?= svn
SVNFLAGS?= -r HEAD
SUP?= /usr/bin/csup
SUPFLAGS?= -g -L 2
.if defined(SUPHOST)
@ -854,10 +856,24 @@ update:
.endif
.endif
.if defined(CVS_UPDATE)
@echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
@cd ${.CURDIR} ; \
if [ -d CVS ] ; then \
echo "--------------------------------------------------------------" ; \
echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
echo "--------------------------------------------------------------" ; \
echo ${CVS} -R -q update ${CVSFLAGS} ; \
${CVS} -R -q update ${CVSFLAGS} ; \
fi
.endif
.if defined(SVN_UPDATE)
@cd ${.CURDIR} ; \
if [ -d .svn ] ; then \
echo "--------------------------------------------------------------" ; \
echo ">>> Updating ${.CURDIR} using Subversion" ; \
echo "--------------------------------------------------------------" ; \
echo ${SVN} update ${SVNFLAGS} ; \
${SVN} update ${SVNFLAGS} ; \
fi
.endif
#