- define COMMON as "${.CURDIR}/../common", and use appropriately

- remove .PATH: ${.CURDIR}/../common
- update the various MERGED_SRCS lines to reflect reality
This commit is contained in:
lukem 2002-07-21 08:14:46 +00:00
parent 2e0c7e68a5
commit 450802d92e
29 changed files with 75 additions and 51 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.30 2002/07/21 00:12:28 lukem Exp $
# $NetBSD: Makefile.inc,v 1.31 2002/07/21 08:14:46 lukem Exp $
#
# Ross Harvey <ross@netbsd.org>
@ -11,14 +11,16 @@
MKTOCS?=yes
M?= ${.CURDIR:T}
COMMON= ${.CURDIR}/../common
MAIN= ${.CURDIR}/../common/main ${.CURDIR}/../common/macros ${EXTRA}
MAIN= ${COMMON}/main ${COMMON}/macros ${EXTRA}
TARG= INSTALL
TARGS= ${TARG}.ps ${TARG}.txt ${TARG}.html ${TARG}.more
TOCS= ${TARG}.PostScript.toc ${TARG}.ASCII.toc ${TARG}.HTML.toc \
${TARG}.more.toc
SRCS= ${MAIN} whatis contents hardware xfer prep ${.CURDIR}/install \
upgrade donations legal.common legal postinstall \
SRCS= ${MAIN} whatis ${COMMON}/contents hardware xfer prep \
${.CURDIR}/install ${COMMON}/postinstall upgrade \
${COMMON}/donations ${COMMON}/legal.common legal \
${.CURDIR}/../Makefile.inc ${MERGED_SRCS}
PRESET= ${GFLAGS} -dM=${M} -dV=${DISTRIBVER} -d.CURDIR=${.CURDIR} -r${M}=1
@ -99,8 +101,6 @@ ${TARG}.more.toc: ${SRCS}
release: check_RELEASEDIR .WAIT ${TARGS}
${RELEASE_INSTALL} ${TARGS} ${RELEASEDIR}/.
.PATH: ${.CURDIR}/../common
cleannotes:
rm -f [Ee]rrs mklog core *.core ${TARGS} ${TOCS} \
${TOCS:S/.toc$/.toc.tmp/g}

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/03/24 22:14:24 bjh21 Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:47 lukem Exp $
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2001/10/14 14:08:03 bjh21 Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:47 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:47 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:47 lukem Exp $
MERGED_SRCS+= ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:47 lukem Exp $
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/04/02 11:36:34 skrll Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:48 lukem Exp $
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.1 2001/11/30 23:48:51 thorpej Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:48 lukem Exp $
MERGED_SRCS+= ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:48 lukem Exp $
MERGED_SRCS+= ${COMMON}/netboot ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:48 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/06/15 21:31:38 itojun Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:49 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.5 2001/01/14 21:37:56 mycroft Exp $
# $NetBSD: Makefile,v 1.6 2002/07/21 08:14:49 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:57 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:49 lukem Exp $
EXTRA= ${.CURDIR}/contrib
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade
EXTRA= ${.CURDIR}/contrib
.include <bsd.man.mk>

View File

@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:57 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:49 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/netboot \
${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/06/15 21:31:36 itojun Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:49 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2002/04/05 21:14:35 scw Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:50 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../hp300/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${.CURDIR}/../hp300/upgrade
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:57 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:50 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/06/15 16:48:39 tsutsui Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:50 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:57 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:50 lukem Exp $
MERGED_SRCS+= ${COMMON}/netboot
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:57 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:50 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/06/17 20:32:22 augustss Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:51 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2001/10/24 18:30:34 briggs Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:51 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/05/18 17:31:43 pooka Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:51 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/03/30 09:12:40 thorpej Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:51 lukem Exp $
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:58 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:51 lukem Exp $
MERGED_SRCS+= ${COMMON}/netboot ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:58 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:52 lukem Exp $
MERGED_SRCS+= ${.CURDIR}/../sparc/legal ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 2001/01/14 21:37:58 mycroft Exp $
# $NetBSD: Makefile,v 1.4 2002/07/21 08:14:52 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.1 2002/06/16 00:38:34 wiz Exp $
# $NetBSD: Makefile,v 1.2 2002/07/21 08:14:52 lukem Exp $
MERGED_SRCS+=${.CURDIR}/../common/sysinst ${.CURDIR}/../common/upgrade
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/netboot ${COMMON}/xfer
.include <bsd.man.mk>

View File

@ -1,3 +1,5 @@
# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:58 mycroft Exp $
# $NetBSD: Makefile,v 1.3 2002/07/21 08:14:52 lukem Exp $
MERGED_SRCS+= ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
.include <bsd.man.mk>