aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMurray Stokely <murray@FreeBSD.org>2001-10-29 09:21:53 +0000
committerMurray Stokely <murray@FreeBSD.org>2001-10-29 09:21:53 +0000
commitf92319a1b119b8b575f3ef1ad167217c3ced4b8b (patch)
treee2d3071409e12641266ba163c6ca00c33b946497 /Makefile
parent4957cc2b7f463d9aa62d3cf0f07146cdf1a638ef (diff)
downloaddoc-f92319a1b119b8b575f3ef1ad167217c3ced4b8b.tar.gz
doc-f92319a1b119b8b575f3ef1ad167217c3ced4b8b.zip
Make build/install /usr/obj prefix clean.
Also fix several minor bugs here, such as leftover files not being deleted after 'make clean'. PR: docs/31131 Submitted by: Cyrille Lefevre <clefevre@citeweb.net>
Notes
Notes: svn path=/head/; revision=11066
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 17 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index a4b0bdfd80..3370f85a5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/Makefile,v 1.20 2000/09/21 20:48:16 ben Exp $
+# $FreeBSD$
#
# The user can override the default list of languages to build and install
# with the DOC_LANG variable.
@@ -17,26 +17,32 @@ SUBDIR+= zh_TW.Big5
DOC_PREFIX?= ${.CURDIR}
+SUP?= ${PREFIX}/bin/cvsup
+SUPFLAGS?= -g -L 2 -P -
.if defined(SUPHOST)
SUPFLAGS+= -h ${SUPHOST}
.endif
+
+CVS?= /usr/bin/cvs
+CVSFLAGS?= -q
+
update:
.if defined(SUP_UPDATE)
.if !defined(DOCSUPFILE)
- @echo "Error: Please define DOCSUPFILE before doing make update."
+ @${ECHO_CMD} "Error: Please define DOCSUPFILE before doing make update."
@exit 1
.endif
- @echo "--------------------------------------------------------------"
- @echo ">>> Running ${SUP}"
- @echo "--------------------------------------------------------------"
+ @${ECHODIR} "--------------------------------------------------------------"
+ @${ECHODIR} ">>> Running ${SUP}"
+ @${ECHODIR} "--------------------------------------------------------------"
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
.elif defined(CVS_UPDATE)
- @echo "--------------------------------------------------------------"
- @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
- @echo "--------------------------------------------------------------"
- cd ${.CURDIR}; cvs -q update -P -d
+ @${ECHODIR} "--------------------------------------------------------------"
+ @${ECHODIR} ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
+ @${ECHODIR} "--------------------------------------------------------------"
+ cd ${.CURDIR}; ${CVS} ${CVSFLAGS} update -P -d
.else
- @echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
+ @${ECHO_CMD} "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
.endif
-.include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
+.include "${DOC_PREFIX}/share/mk/doc.project.mk"