diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-08-07 14:35:49 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-08-07 14:35:49 +0000 |
| commit | ef10227633220ee0e330e8ba51562a65f273c4a5 (patch) | |
| tree | 5d9d00a0f1c9b46d69bf835c266ec55f2f4cb842 /Makefile.inc1 | |
| parent | 934a4fb381632fe5f9cf310360a947f64b729eae (diff) | |
| download | src-test2-ef10227633220ee0e330e8ba51562a65f273c4a5.tar.gz src-test2-ef10227633220ee0e330e8ba51562a65f273c4a5.zip | |
Make the update target consistent; both ports and doc are updated
if their SUPFILE variables are defined _and_ NO_PORTSUPDATE and
NO_DOCUPDATE respectively are not defined.
Previously, only ports was updated and there was no way to prevent
this without undefining its SUPFILE variable.
PR: 17514
Reported by: Udo Erdelhoff <ue@nathan.ruhr.de>
Notes
Notes:
svn path=/head/; revision=64340
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a9ecb868ecf3..752bb6340e99 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -16,6 +16,8 @@ # -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel +# -DNO_PORTSUPDATE do not update ports in ${MAKE} update +# -DNO_DOCUPDATE do not update doc in ${MAKE} update # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # @@ -438,9 +440,12 @@ update: .if defined(SUPFILE2) @${SUP} ${SUPFLAGS} ${SUPFILE2} .endif -.if defined(PORTSSUPFILE) +.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE) @${SUP} ${SUPFLAGS} ${PORTSSUPFILE} .endif +.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) + @${SUP} ${SUPFLAGS} ${DOCSUPFILE} +.endif .endif .if defined(CVS_UPDATE) @echo "--------------------------------------------------------------" |