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

Make the update target consistent; both ports and doc are updated

Browse Source 
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>
This commit is contained in:
Sheldon Hearn 2000-08-07 14:35:49 +00:00
parent 934a4fb381
commit ef10227633
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.inc1
View File

@ -16,6 +16,8 @@
# -DNO_FORTRAN do not build g77 and related libraries. # -DNO_FORTRAN do not build g77 and related libraries.
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELDEPEND do not run ${MAKE} depend 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 # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
# #
@ -438,9 +440,12 @@ update:
.if defined(SUPFILE2) .if defined(SUPFILE2)
@${SUP} ${SUPFLAGS} ${SUPFILE2} @${SUP} ${SUPFLAGS} ${SUPFILE2}
.endif .endif
.if defined(PORTSSUPFILE) .if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
@${SUP} ${SUPFLAGS} ${PORTSSUPFILE} @${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
.endif .endif
.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
.endif
.endif .endif
.if defined(CVS_UPDATE) .if defined(CVS_UPDATE)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"