[src/netbsd-1-6]: src/distrib/notes Pull up revision 1.2 (requested by lukem):

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2336eec44faf
branches:  netbsd-1-6
changeset: 528532:2336eec44faf
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jul 22 05:03:03 2002 +0000

description:
Pull up revision 1.2 (requested by lukem):
- define COMMON as "${.CURDIR}/../common", and use appropriately
- remove .PATH: ${.CURDIR}/../common
- update the various MERGED_SRCS lines to reflect reality

diffstat:

 distrib/notes/cats/Makefile   |  4 +++-
 distrib/notes/evbarm/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 0715f1c9173c -r 2336eec44faf distrib/notes/cats/Makefile
--- a/distrib/notes/cats/Makefile       Mon Jul 22 05:02:47 2002 +0000
+++ b/distrib/notes/cats/Makefile       Mon Jul 22 05:03:03 2002 +0000
@@ -1,3 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2002/04/02 11:36:34 skrll Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2002/07/22 05:03:03 lukem Exp $
+
+MERGED_SRCS+=  ${COMMON}/sysinst ${COMMON}/upgrade ${COMMON}/xfer
 
 .include <bsd.man.mk>
diff -r 0715f1c9173c -r 2336eec44faf distrib/notes/evbarm/Makefile
--- a/distrib/notes/evbarm/Makefile     Mon Jul 22 05:02:47 2002 +0000
+++ b/distrib/notes/evbarm/Makefile     Mon Jul 22 05:03:03 2002 +0000
@@ -1,3 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2001/11/30 23:48:51 thorpej Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2002/07/22 05:03:11 lukem Exp $
+
+MERGED_SRCS+=  ${COMMON}/xfer
 
 .include <bsd.man.mk>