Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/notes - define COMMON as "${.CURDIR}/../common", and...
details: https://anonhg.NetBSD.org/src/rev/9246de92f78c
branches: trunk
changeset: 534305:9246de92f78c
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Jul 21 08:14:46 2002 +0000
description:
- define COMMON as "${.CURDIR}/../common", and use appropriately
- remove .PATH: ${.CURDIR}/../common
- update the various MERGED_SRCS lines to reflect reality
diffstat:
distrib/notes/Makefile.inc | 12 ++++++------
distrib/notes/acorn26/Makefile | 4 +++-
distrib/notes/acorn32/Makefile | 4 ++--
distrib/notes/alpha/Makefile | 4 ++--
distrib/notes/amiga/Makefile | 4 +++-
distrib/notes/atari/Makefile | 4 +++-
distrib/notes/cats/Makefile | 4 +++-
distrib/notes/evbarm/Makefile | 4 +++-
distrib/notes/hp300/Makefile | 4 +++-
distrib/notes/hpcmips/Makefile | 4 ++--
distrib/notes/hpcsh/Makefile | 4 ++--
distrib/notes/i386/Makefile | 4 ++--
distrib/notes/mac68k/Makefile | 5 +++--
distrib/notes/macppc/Makefile | 5 +++--
distrib/notes/mmeye/Makefile | 4 ++--
distrib/notes/mvme68k/Makefile | 4 ++--
distrib/notes/news68k/Makefile | 4 ++--
distrib/notes/newsmips/Makefile | 4 ++--
distrib/notes/next68k/Makefile | 4 +++-
distrib/notes/pmax/Makefile | 4 ++--
distrib/notes/pmppc/Makefile | 4 ++--
distrib/notes/sandpoint/Makefile | 4 ++--
distrib/notes/sgimips/Makefile | 4 ++--
distrib/notes/shark/Makefile | 4 +++-
distrib/notes/sparc/Makefile | 4 +++-
distrib/notes/sparc64/Makefile | 4 +++-
distrib/notes/vax/Makefile | 4 ++--
distrib/notes/walnut/Makefile | 4 ++--
distrib/notes/x68k/Makefile | 4 +++-
29 files changed, 75 insertions(+), 51 deletions(-)
diffs (truncated from 337 to 300 lines):
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/Makefile.inc
--- a/distrib/notes/Makefile.inc Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/Makefile.inc Sun Jul 21 08:14:46 2002 +0000
@@ -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@localhost>
@@ -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 @@
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}
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/acorn26/Makefile
--- a/distrib/notes/acorn26/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/acorn26/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/acorn32/Makefile
--- a/distrib/notes/acorn32/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/acorn32/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/alpha/Makefile
--- a/distrib/notes/alpha/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/alpha/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/amiga/Makefile
--- a/distrib/notes/amiga/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/amiga/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/atari/Makefile
--- a/distrib/notes/atari/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/atari/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/cats/Makefile
--- a/distrib/notes/cats/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/cats/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/evbarm/Makefile
--- a/distrib/notes/evbarm/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/evbarm/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/hp300/Makefile
--- a/distrib/notes/hp300/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/hp300/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/hpcmips/Makefile
--- a/distrib/notes/hpcmips/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/hpcmips/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/hpcsh/Makefile
--- a/distrib/notes/hpcsh/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/hpcsh/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/i386/Makefile
--- a/distrib/notes/i386/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/i386/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/mac68k/Makefile
--- a/distrib/notes/mac68k/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/mac68k/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/macppc/Makefile
--- a/distrib/notes/macppc/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/macppc/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/mmeye/Makefile
--- a/distrib/notes/mmeye/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/mmeye/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/mvme68k/Makefile
--- a/distrib/notes/mvme68k/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/mvme68k/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/news68k/Makefile
--- a/distrib/notes/news68k/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/news68k/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/newsmips/Makefile
--- a/distrib/notes/newsmips/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/newsmips/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/next68k/Makefile
--- a/distrib/notes/next68k/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/next68k/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/pmax/Makefile
--- a/distrib/notes/pmax/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/pmax/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/pmppc/Makefile
--- a/distrib/notes/pmppc/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/pmppc/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/sandpoint/Makefile
--- a/distrib/notes/sandpoint/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/sandpoint/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/sgimips/Makefile
--- a/distrib/notes/sgimips/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/sgimips/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/shark/Makefile
--- a/distrib/notes/shark/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/shark/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/sparc/Makefile
--- a/distrib/notes/sparc/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/sparc/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -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>
diff -r 564e922283e4 -r 9246de92f78c distrib/notes/sparc64/Makefile
--- a/distrib/notes/sparc64/Makefile Sun Jul 21 05:47:51 2002 +0000
+++ b/distrib/notes/sparc64/Makefile Sun Jul 21 08:14:46 2002 +0000
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2001/01/14 21:37:58 mycroft Exp $
Home |
Main Index |
Thread Index |
Old Index