teeny bit more unification

6 files changed, 27 insertions, 34 deletions

diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 8b2a9a31445..abc061c44f6 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armish,v 1.21 2010/04/27 06:46:25 deraadt Exp $
+#	$OpenBSD: Makefile.armish,v 1.22 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -88,17 +88,16 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
 SYSTEM_LD_TAIL=	@dd if=/dev/zero of=bsd bs=1 count=1 seek=95 conv=notrunc 2>/dev/null; \
-    dd if=/dev/zero of=bsd bs=1 count=1 seek=127 conv=notrunc 2>/dev/null; \
-    dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null; \
-    ${SIZE} $@; chmod 755 $@
+		dd if=/dev/zero of=bsd bs=1 count=1 seek=127 conv=notrunc 2>/dev/null; \
+		dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null; \
+		${SIZE} $@; chmod 755 $@
 
 DEBUG?=
 .if ${DEBUG} == "-g"
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 313fb169b71..cc0154915e2 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.beagle,v 1.16 2010/04/27 06:46:25 deraadt Exp $
+#	$OpenBSD: Makefile.beagle,v 1.17 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -87,11 +87,9 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    ( cat ${_archdir}/conf/ldscript.head ;\
-    cat ${_archdir}/conf/ldscript.tail ) |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 33cc6d855bf..8e68990f2b7 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.gumstix,v 1.14 2010/04/27 06:46:25 deraadt Exp $
+#	$OpenBSD: Makefile.gumstix,v 1.15 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -88,10 +88,9 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index ace08f33cc0..32c7825255e 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.moko,v 1.14 2010/04/27 06:46:26 deraadt Exp $
+#	$OpenBSD: Makefile.moko,v 1.15 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -88,10 +88,9 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 97929ecaeb4..781508448ef 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.palm,v 1.11 2010/04/27 06:46:26 deraadt Exp $
+#	$OpenBSD: Makefile.palm,v 1.12 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -88,10 +88,9 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 05645d5d65b..08548644b6f 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.zaurus,v 1.24 2010/04/27 06:46:26 deraadt Exp $
+#	$OpenBSD: Makefile.zaurus,v 1.25 2010/04/27 15:33:08 deraadt Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -88,10 +88,9 @@ SYSTEM_OBJ=	${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD_HEAD+=; \
-    cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail |  \
-	sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-	-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
-     > ldscript
+		cat ${_archdir}/conf/ldscript.head ${_archdir}/conf/ldscript.tail | \
+		    sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
+		    -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
 
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
 		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o