Module Name: src
Committed By: christos
Date: Wed Jan 22 01:03:10 UTC 2014
Modified Files:
src/distrib/acorn32/stand: Makefile
src/distrib/atari/misc: Makefile
src/distrib/hpcarm/stand: Makefile
src/distrib/hpcsh/stand: Makefile
src/distrib/x68k/stand: Makefile
Log Message:
Revert Makefile changes.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/acorn32/stand/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/atari/misc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/hpcarm/stand/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/hpcsh/stand/Makefile
cvs rdiff -u -r1.8 -r1.9 src/distrib/x68k/stand/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/acorn32/stand/Makefile
diff -u src/distrib/acorn32/stand/Makefile:1.27 src/distrib/acorn32/stand/Makefile:1.28
--- src/distrib/acorn32/stand/Makefile:1.27 Tue Jan 21 15:12:54 2014
+++ src/distrib/acorn32/stand/Makefile Tue Jan 21 20:03:09 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2014/01/21 20:12:54 christos Exp $
+# $NetBSD: Makefile,v 1.28 2014/01/22 01:03:09 christos Exp $
#
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
-
# we use spark, so that we get filetypes.
ARCHIVE=BtNetBSD.spk
@@ -121,4 +121,4 @@ localclean:
rm -f ${ARCHIVE}
-if [ -d tmp ]; then rm -rf tmp; fi
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.include <bsd.files.mk>
Index: src/distrib/atari/misc/Makefile
diff -u src/distrib/atari/misc/Makefile:1.3 src/distrib/atari/misc/Makefile:1.4
--- src/distrib/atari/misc/Makefile:1.3 Tue Jan 21 19:28:35 2014
+++ src/distrib/atari/misc/Makefile Tue Jan 21 20:03:09 2014
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/01/22 00:28:35 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/22 01:03:09 christos Exp $
#
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
all: ${UUDECODE_FILES}
@@ -13,4 +14,4 @@ release: check_RELEASEDIR .WAIT ${UUDECO
UUDECODE_FILES=chg_pid.ttp gzip.ttp rawwrite.ttp aptck.ttp file2swp.ttp
UUDECODE_FILES+=loadbsd.ttp
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.include <bsd.files.mk>
Index: src/distrib/hpcarm/stand/Makefile
diff -u src/distrib/hpcarm/stand/Makefile:1.4 src/distrib/hpcarm/stand/Makefile:1.5
--- src/distrib/hpcarm/stand/Makefile:1.4 Tue Jan 21 19:27:36 2014
+++ src/distrib/hpcarm/stand/Makefile Tue Jan 21 20:03:10 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/01/22 00:27:36 christos Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/22 01:03:10 christos Exp $
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
@@ -15,5 +16,5 @@ release:: check_RELEASEDIR .WAIT ${HPCBO
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.obj.mk>
+.include <bsd.files.mk>
Index: src/distrib/hpcsh/stand/Makefile
diff -u src/distrib/hpcsh/stand/Makefile:1.3 src/distrib/hpcsh/stand/Makefile:1.4
--- src/distrib/hpcsh/stand/Makefile:1.3 Tue Jan 21 19:51:38 2014
+++ src/distrib/hpcsh/stand/Makefile Tue Jan 21 20:03:10 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/01/22 00:51:38 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/22 01:03:10 christos Exp $
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
@@ -27,4 +28,4 @@ release:: ${UUDECODE_FILES}
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT_SH4} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.include <bsd.files.mk>
Index: src/distrib/x68k/stand/Makefile
diff -u src/distrib/x68k/stand/Makefile:1.8 src/distrib/x68k/stand/Makefile:1.9
--- src/distrib/x68k/stand/Makefile:1.8 Tue Jan 21 19:49:46 2014
+++ src/distrib/x68k/stand/Makefile Tue Jan 21 20:03:10 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/01/22 00:49:46 christos Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/22 01:03:10 christos Exp $
.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
ARCHIVES= gzip rawrite
MEMBER_gzip= gz124x5f.lzh gzip.x
@@ -23,4 +24,4 @@ release:
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
.endfor
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.include <bsd.files.mk>
