Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move '${MAKEDIRTARGET} x11 distribution' from Makefile::distribution to

Browse Source 
etc/Makefile::distribution, and only perform if ${MKX11}!=no.
Should fix a problem experienced by Alistair whilst doing a "make release".
This commit is contained in:
lukem 2004-05-17 07:00:16 +00:00
parent cdbc6c6463
commit fe7056555c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.233 2004/05/16 10:27:21 lukem Exp $
# $NetBSD: Makefile,v 1.234 2004/05/17 07:00:16 lukem Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@ -240,7 +240,6 @@ distribution buildworld: .PHONY
@false
.endif
${MAKEDIRTARGET} . build NOPOSTINSTALL=1
${MAKEDIRTARGET} x11 distribution
${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
${MAKEDIRTARGET} . postinstall-fix-obsolete

5
etc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.287 2004/05/16 09:53:09 lukem Exp $
# $NetBSD: Makefile,v 1.288 2004/05/17 07:00:16 lukem Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@ -142,6 +142,9 @@ distribution: .PHONY check_DESTDIR .WAIT distrib-dirs
${MAKEDIRTARGET} ${NETBSDSRCDIR} install _DISTRIB=
.endif # !INSTALL_DONE
${MAKEDIRTARGET} . install-etc-files
.if ${MKX11} != "no"
${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
.endif
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets makesetfiles
.endif # !DISTRIBUTION_DONE