From 8fd46ab4554b7526d9001710a3297460c0bce9f8 Mon Sep 17 00:00:00 2001 From: sheldonh Date: Mon, 7 Aug 2000 14:35:49 +0000 Subject: 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 --- Makefile.inc1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index a9ecb86..752bb63 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 "--------------------------------------------------------------" -- cgit v1.1