Module Name: src
Committed By: tsutsui
Date: Mon Mar 30 09:22:53 UTC 2009
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/fatboot: Makefile.fat
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/i386/stand/mbr: Makefile.mbr
src/sys/arch/i386/stand/netboot: Makefile.netboot
src/sys/arch/i386/stand/pxeboot: Makefile
Log Message:
Remove extra trailing slash in ${S} path.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/fatboot/Makefile.fat
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/stand/mbr/Makefile.mbr
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/netboot/Makefile.netboot
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/stand/pxeboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.77 src/sys/arch/i386/stand/Makefile.booters:1.78
--- src/sys/arch/i386/stand/Makefile.booters:1.77 Thu Jan 8 19:02:12 2009
+++ src/sys/arch/i386/stand/Makefile.booters Mon Mar 30 09:22:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.77 2009/01/08 19:02:12 jakllsch Exp $
+# $NetBSD: Makefile.booters,v 1.78 2009/03/30 09:22:52 tsutsui Exp $
.include <bsd.own.mk>
@@ -104,8 +104,8 @@
LIBLIST=${LIBI386} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBI386} ${LIBSA}
-vers.c: ${VERSIONFILE} ${SOURCES} ${S}conf/newvers_stand.sh
- ${HOST_SH} ${S}conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
+vers.c: ${VERSIONFILE} ${SOURCES} ${S}/conf/newvers_stand.sh
+ ${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
CLEANFILES+= ${BASE}.sym
${BASE}.sym: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386}
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.39 src/sys/arch/i386/stand/boot/Makefile.boot:1.40
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.39 Thu Mar 12 17:16:59 2009
+++ src/sys/arch/i386/stand/boot/Makefile.boot Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.boot,v 1.39 2009/03/12 17:16:59 abs Exp $
+# $NetBSD: Makefile.boot,v 1.40 2009/03/30 09:22:52 tsutsui Exp $
-S= ${.CURDIR}/../../../../../
+S= ${.CURDIR}/../../../../..
NOMAN=
PROG?= boot
@@ -138,7 +138,7 @@
CLEANFILES+= ${PROG}.tmp ${PROG}.map vers.c
vers.c: ${VERSIONFILE} ${SOURCES} ${LIBLIST} ${.CURDIR}/../Makefile.boot
- ${HOST_SH} ${S}conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
+ ${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
# Anything that calls 'real_to_prot' must have a %pc < 0x10000.
# We link the program, find the callers (all in libi386), then
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.34 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.35
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.34 Thu Mar 12 17:16:59 2009
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.bootxx,v 1.34 2009/03/12 17:16:59 abs Exp $
+# $NetBSD: Makefile.bootxx,v 1.35 2009/03/30 09:22:52 tsutsui Exp $
-S= ${.CURDIR}/../../../../../
+S= ${.CURDIR}/../../../../..
PIE_CFLAGS=
PIE_LDFLAGS=
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.24 src/sys/arch/i386/stand/dosboot/Makefile:1.25
--- src/sys/arch/i386/stand/dosboot/Makefile:1.24 Mon Oct 20 03:02:07 2008
+++ src/sys/arch/i386/stand/dosboot/Makefile Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2008/10/20 03:02:07 christos Exp $
+# $NetBSD: Makefile,v 1.25 2009/03/30 09:22:52 tsutsui Exp $
-S= ${.CURDIR}/../../../../
+S= ${.CURDIR}/../../../..
BASE= dosboot
PROG= ${BASE}.com
Index: src/sys/arch/i386/stand/fatboot/Makefile.fat
diff -u src/sys/arch/i386/stand/fatboot/Makefile.fat:1.4 src/sys/arch/i386/stand/fatboot/Makefile.fat:1.5
--- src/sys/arch/i386/stand/fatboot/Makefile.fat:1.4 Thu Mar 12 17:16:59 2009
+++ src/sys/arch/i386/stand/fatboot/Makefile.fat Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.fat,v 1.4 2009/03/12 17:16:59 abs Exp $
+# $NetBSD: Makefile.fat,v 1.5 2009/03/30 09:22:52 tsutsui Exp $
-S= ${.CURDIR}/../../../../../
+S= ${.CURDIR}/../../../../..
PROG?= fatboot
NOMAN= # defined
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.27 src/sys/arch/i386/stand/lib/Makefile:1.28
--- src/sys/arch/i386/stand/lib/Makefile:1.27 Mon Feb 16 22:39:30 2009
+++ src/sys/arch/i386/stand/lib/Makefile Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2009/02/16 22:39:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.28 2009/03/30 09:22:52 tsutsui Exp $
-S?= ${.CURDIR}/../../../../
+S?= ${.CURDIR}/../../../..
LIB= i386
NOPIC=# defined
Index: src/sys/arch/i386/stand/mbr/Makefile.mbr
diff -u src/sys/arch/i386/stand/mbr/Makefile.mbr:1.15 src/sys/arch/i386/stand/mbr/Makefile.mbr:1.16
--- src/sys/arch/i386/stand/mbr/Makefile.mbr:1.15 Thu Mar 12 17:16:59 2009
+++ src/sys/arch/i386/stand/mbr/Makefile.mbr Mon Mar 30 09:22:52 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.mbr,v 1.15 2009/03/12 17:16:59 abs Exp $
+# $NetBSD: Makefile.mbr,v 1.16 2009/03/30 09:22:52 tsutsui Exp $
-S= ${.CURDIR}/../../../../../
+S= ${.CURDIR}/../../../../..
NOMAN= # defined
Index: src/sys/arch/i386/stand/netboot/Makefile.netboot
diff -u src/sys/arch/i386/stand/netboot/Makefile.netboot:1.7 src/sys/arch/i386/stand/netboot/Makefile.netboot:1.8
--- src/sys/arch/i386/stand/netboot/Makefile.netboot:1.7 Mon Oct 20 20:00:57 2008
+++ src/sys/arch/i386/stand/netboot/Makefile.netboot Mon Mar 30 09:22:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.netboot,v 1.7 2008/10/20 20:00:57 christos Exp $
+# $NetBSD: Makefile.netboot,v 1.8 2009/03/30 09:22:52 tsutsui Exp $
NOMAN= # defined
@@ -7,7 +7,7 @@
PIE_AFLAGS=
.include "../Makefile.inc"
-S= ${.CURDIR}/../../../../../
+S= ${.CURDIR}/../../../../..
BASE= netboot_${USE_NETIF}
PROG= ${BASE}.rom
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.16 src/sys/arch/i386/stand/pxeboot/Makefile:1.17
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.16 Sat Feb 14 13:52:51 2009
+++ src/sys/arch/i386/stand/pxeboot/Makefile Mon Mar 30 09:22:53 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2009/02/14 13:52:51 abs Exp $
+# $NetBSD: Makefile,v 1.17 2009/03/30 09:22:53 tsutsui Exp $
-S= ${.CURDIR}/../../../../
+S= ${.CURDIR}/../../../..
BASE?= pxeboot_ia32
PROG= ${BASE}.bin
