From db24cb6136c0de8106afee4288aea668ff490456 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sun, 25 Jun 2017 14:02:21 +0000
Subject: [PATCH] dull dependency for copying makegap.sh to obj, so that
 installs without src and comp work.  That is what we've designed for, but
 since we always have src and comp on our systems it is so easy to slide...
 problem first noted by rpe.

---
 sys/arch/alpha/conf/Makefile.alpha       | 4 ++--
 sys/arch/amd64/conf/Makefile.amd64       | 4 ++--
 sys/arch/arm64/conf/Makefile.arm64       | 4 ++--
 sys/arch/armv7/conf/Makefile.armv7       | 4 ++--
 sys/arch/hppa/conf/Makefile.hppa         | 4 ++--
 sys/arch/i386/conf/Makefile.i386         | 4 ++--
 sys/arch/landisk/conf/Makefile.landisk   | 4 ++--
 sys/arch/loongson/conf/Makefile.loongson | 4 ++--
 sys/arch/macppc/conf/Makefile.macppc     | 4 ++--
 sys/arch/octeon/conf/Makefile.octeon     | 4 ++--
 sys/arch/sgi/conf/Makefile.sgi           | 4 ++--
 sys/arch/sparc64/conf/Makefile.sparc64   | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index d0817666124..a5b73525bfd 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.102 2017/06/22 16:01:45 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.103 2017/06/25 14:02:21 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 5d8ae7d837f..fd831d3c6ff 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.85 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.86 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -124,7 +124,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index be24a6cde18..b320d959af0 100644
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arm64,v 1.15 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.arm64,v 1.16 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -128,7 +128,7 @@ gapdummy.o:
 	echo 'const char gapdummy;' > gapdummy.c
 	${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 0acdd50a978..dfef4e30db5 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.28 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.armv7,v 1.29 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -126,7 +126,7 @@ gapdummy.o:
 	echo 'const char gapdummy;' > gapdummy.c
 	${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
 
-makegap.sh: Makefile $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 3e0a0d8788f..dbe32e70f70 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.96 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.97 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -129,7 +129,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 9b2c40e4d42..02707bc0778 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.111 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.112 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -125,7 +125,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 83c2b17964c..94e7b09075b 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.68 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.69 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 84750f485d9..762d8065a3d 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.61 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.62 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,7 +130,7 @@ gapdummy.o:
 	echo 'const char gapdummy;' > gapdummy.c
 	${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
 
-makegap.sh: Makefile $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index a3c3047f118..b98eba544c5 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.84 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.85 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -121,7 +121,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index 4bebc8cd407..3de82942c60 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.octeon,v 1.37 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.octeon,v 1.38 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -131,7 +131,7 @@ gapdummy.o:
 	echo 'const char gapdummy;' > gapdummy.c
 	${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
 
-makegap.sh: Makefile $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index c077d67d154..b9ede557153 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.85 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.86 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,7 +130,7 @@ gapdummy.o:
 	echo 'const char gapdummy;' > gapdummy.c
 	${CC} -c ${CFLAGS} ${CPPFLAGS} gapdummy.c -o $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh gapdummy.o
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index f9ca4b9ae46..1a3de321cac 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.88 2017/06/22 16:01:48 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.89 2017/06/25 14:02:23 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -119,7 +119,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-makegap.sh: $S/conf/makegap.sh
+makegap.sh:
 	cp $S/conf/makegap.sh $@
 
 gap.o:	Makefile makegap.sh
-- 
2.20.1