Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sbin Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../...
details: https://anonhg.NetBSD.org/src/rev/9d839924d1b4
branches: trunk
changeset: 535449:9d839924d1b4
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Aug 19 10:16:51 2002 +0000
description:
Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path
diffstat:
sbin/badsect/Makefile | 6 ++++--
sbin/clri/Makefile | 6 ++++--
sbin/dump/Makefile | 8 +++++---
sbin/dump_lfs/Makefile | 11 +++++++----
sbin/fsck_ext2fs/Makefile | 8 +++++---
sbin/fsck_ffs/Makefile | 8 +++++---
sbin/fsck_lfs/Makefile | 8 +++++---
sbin/fsck_msdos/Makefile | 6 ++++--
sbin/fsdb/Makefile | 10 ++++++----
sbin/fsirand/Makefile | 6 ++++--
sbin/ldconfig/Makefile | 6 +++---
sbin/mbrlabel/Makefile | 6 ++++--
sbin/mount/Makefile | 6 ++++--
sbin/mount_ados/Makefile | 8 +++++---
sbin/mount_cd9660/Makefile | 6 ++++--
sbin/mount_ext2fs/Makefile | 6 ++++--
sbin/mount_fdesc/Makefile | 6 ++++--
sbin/mount_ffs/Makefile | 6 ++++--
sbin/mount_filecore/Makefile | 6 ++++--
sbin/mount_kernfs/Makefile | 6 ++++--
sbin/mount_lfs/Makefile | 6 ++++--
sbin/mount_msdos/Makefile | 8 +++++---
sbin/mount_nfs/Makefile | 6 ++++--
sbin/mount_ntfs/Makefile | 6 ++++--
sbin/mount_null/Makefile | 8 +++++---
sbin/mount_overlay/Makefile | 8 +++++---
sbin/mount_portal/Makefile | 8 +++++---
sbin/mount_procfs/Makefile | 6 ++++--
sbin/mount_umap/Makefile | 8 +++++---
sbin/mount_union/Makefile | 8 +++++---
sbin/newfs/Makefile | 10 ++++++----
sbin/newfs_lfs/Makefile | 6 ++++--
sbin/pdisk/Makefile | 4 ++--
sbin/restore/Makefile | 6 ++++--
sbin/rtsol/Makefile | 9 ++++++---
sbin/setkey/Makefile | 9 +++++----
sbin/sysctl/Makefile | 6 ++++--
sbin/tunefs/Makefile | 6 ++++--
sbin/umount/Makefile | 6 ++++--
39 files changed, 174 insertions(+), 99 deletions(-)
diffs (truncated from 820 to 300 lines):
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/badsect/Makefile
--- a/sbin/badsect/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/badsect/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.12 1999/01/15 13:32:05 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/19 10:16:51 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+.include <bsd.own.mk>
+
PROG= badsect
SRCS= badsect.c ffs_bswap.c
MAN= badsect.8
-.PATH: ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/clri/Makefile
--- a/sbin/clri/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/clri/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.9 1999/01/15 13:32:05 bouyer Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:52 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+.include <bsd.own.mk>
+
PROG= clri
MAN= clri.8
SRCS= clri.c ffs_bswap.c
-.PATH: ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/dump/Makefile
--- a/sbin/dump/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/dump/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/08/02 02:07:09 christos Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/19 10:16:52 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -20,10 +20,12 @@
# STATS read cache statistics
# DIAGNOSTICS read cache diagnostic checks
+.include <bsd.own.mk>
+
PROG= dump
LINKS= ${BINDIR}/dump ${BINDIR}/rdump
CPPFLAGS+=-DRDUMP -I${.CURDIR}
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
# CPPFLAGS+= -DDEBUG -DTDEBUG -DFDEBUG -DWRITEDEBUG -DSTATS -DDIAGNOSTICS
SRCS= itime.c main.c optr.c dumprmt.c rcache.c tape.c traverse.c unctime.c \
ffs_inode.c ffs_bswap.c utmpentry.c
@@ -32,6 +34,6 @@
MAN= dump.8
MLINKS+=dump.8 rdump.8
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../../usr.bin/who
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs ${NETBSDSRCDIR}/usr.bin/who
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/dump_lfs/Makefile
--- a/sbin/dump_lfs/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/dump_lfs/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/02 12:29:36 scw Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/19 10:16:53 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# lfs_inode.c LFS filestore-specific routines
@@ -6,11 +6,13 @@
# DEBUG use local directory to find ddate and dumpdates
# TDEBUG trace out the process forking
+.include <bsd.own.mk>
+
PROG= dump_lfs
LINKS= ${BINDIR}/dump_lfs ${BINDIR}/rdump_lfs
-CPPFLAGS+=-DRDUMP -I${.CURDIR} -I${.CURDIR}/../dump
+CPPFLAGS+=-DRDUMP -I${.CURDIR} -I${NETBSDSRCDIR}/sbin/dump
CPPFLAGS+=-DDUMP_LFS
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
# CPPFLAGS+= -DDEBUG -DTDEBUG -DFDEBUG -DWRITEDEBUG -DSTATS -DDIAGNOSTICS
SRCS= itime.c main.c optr.c dumprmt.c rcache.c tape.c traverse.c unctime.c \
ffs_bswap.c lfs_inode.c utmpentry.c
@@ -20,6 +22,7 @@
MLINKS+=dump_lfs.8 rdump_lfs.8
CFLAGS+=-g
-.PATH: ${.CURDIR}/../dump ${.CURDIR}/../../sys/ufs/lfs ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../../usr.bin/who
+.PATH: ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs \
+ ${NETBSDSRCDIR}/sys/ufs/ffs ${NETBSDSRCDIR}/usr.bin/who
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsck_ext2fs/Makefile
--- a/sbin/fsck_ext2fs/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsck_ext2fs/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2000/01/28 16:01:46 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/19 10:16:53 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+.include <bsd.own.mk>
+
PROG= fsck_ext2fs
MAN= fsck_ext2fs.8
SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c fsutil.c setup.c utilities.c ext2fs_bswap.c
-FSCK= ${.CURDIR}/../fsck
+FSCK= ${NETBSDSRCDIR}/sbin/fsck
CPPFLAGS+= -I${FSCK}
-.PATH: ${.CURDIR}/../../sys/ufs/ext2fs ${FSCK}
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ext2fs ${FSCK}
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsck_ffs/Makefile
--- a/sbin/fsck_ffs/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsck_ffs/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.22 1999/01/15 13:32:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.23 2002/08/19 10:16:53 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
+.include <bsd.own.mk>
+
PROG= fsck_ffs
MAN= fsck_ffs.8
SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c fsutil.c setup.c utilities.c ffs_bswap.c ffs_subr.c ffs_tables.c
-FSCK= ${.CURDIR}/../fsck
+FSCK= ${NETBSDSRCDIR}/sbin/fsck
CPPFLAGS+=-I${FSCK}
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${FSCK}
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs ${FSCK}
.if make(install)
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsck_lfs/Makefile
--- a/sbin/fsck_lfs/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsck_lfs/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2000/10/19 14:58:40 fvdl Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/19 10:16:53 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+.include <bsd.own.mk>
+
PROG= fsck_lfs
MAN= fsck_lfs.8
SRCS= dir.c inode.c main.c pass1.c pass2.c pass3.c pass4.c \
fsutil.c setup.c utilities.c lfs_cksum.c vars.c
SRCS+= pass0.c pass5.c
-FSCK= ${.CURDIR}/../fsck
-.PATH: ${.CURDIR}/../../sys/ufs/lfs ${FSCK}
+FSCK= ${NETBSDSRCDIR}/sbin/fsck
+.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
CPPFLAGS+=-I${FSCK} # -DVERBOSE_BLOCKMAP
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsck_msdos/Makefile
--- a/sbin/fsck_msdos/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsck_msdos/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2001/04/06 16:52:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/19 10:16:54 lukem Exp $
+
+.include <bsd.own.mk>
PROG= fsck_msdos
MAN= fsck_msdos.8
@@ -6,7 +8,7 @@
WARNS= 2
-FSCK= ${.CURDIR}/../fsck
+FSCK= ${NETBSDSRCDIR}/sbin/fsck
CPPFLAGS+= -I${FSCK}
.PATH: ${FSCK}
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsdb/Makefile
--- a/sbin/fsdb/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsdb/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.12 1999/01/15 13:32:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/19 10:16:54 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+.include <bsd.own.mk>
+
PROG= fsdb
MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c
@@ -9,10 +11,10 @@
SRCS+= ffs_bswap.c ffs_subr.c ffs_tables.c
SRCS+= fsutil.c
-FSCK= ${.CURDIR}/../fsck
-FSCK_FFS=${.CURDIR}/../fsck_ffs
+FSCK= ${NETBSDSRCDIR}/sbin/fsck
+FSCK_FFS=${NETBSDSRCDIR}/sbin/fsck_ffs
CPPFLAGS+= -I${FSCK} -I${FSCK_FFS}
-.PATH: ${FSCK} ${FSCK_FFS} ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${FSCK} ${FSCK_FFS} ${NETBSDSRCDIR}/sys/ufs/ffs
LDADD+= -ledit -ltermcap
DPADD+= ${LIBEDIT} ${LIBTERMCAP}
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/fsirand/Makefile
--- a/sbin/fsirand/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/fsirand/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2001/11/16 04:25:42 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/19 10:16:54 lukem Exp $
+
+.include <bsd.own.mk>
PROG= fsirand
SRCS= fsirand.c ffs_bswap.c
@@ -8,6 +10,6 @@
WARNS= 2
-.PATH: ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
.include <bsd.prog.mk>
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/ldconfig/Makefile
--- a/sbin/ldconfig/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/ldconfig/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/02/24 03:18:44 matt Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/19 10:16:54 lukem Exp $
.include <bsd.own.mk> # For OBJECT_FMT
@@ -13,8 +13,8 @@
PROG= ldconfig
SRCS= ldconfig.c shlib.c
-CPPFLAGS += -I$(.CURDIR)/../../libexec/ld.aout_so
-.PATH: $(.CURDIR)/../../libexec/ld.aout_so
+CPPFLAGS += -I${NETBSDSRCDIR}/libexec/ld.aout_so
+.PATH: ${NETBSDSRCDIR}/libexec/ld.aout_so
.endif
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/mbrlabel/Makefile
--- a/sbin/mbrlabel/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/mbrlabel/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2000/12/24 13:57:37 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/19 10:16:55 lukem Exp $
-DISKLABELPATH= ${.CURDIR}/../../sbin/disklabel
+.include <bsd.own.mk>
+
+DISKLABELPATH= ${NETBSDSRCDIR}/sbin/disklabel
PROG= mbrlabel
SRCS= mbrlabel.c dkcksum.c printlabel.c
CPPFLAGS+= -I${DISKLABELPATH}
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/mount/Makefile
--- a/sbin/mount/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/mount/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2001/02/20 23:24:47 cgd Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/19 10:16:55 lukem Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
+.include <bsd.own.mk>
+
PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
@@ -21,7 +23,7 @@
# include individual source files and manpages to build process
.for p in ${MOUNT_PROGS}
-.PATH: ${.CURDIR}/../${p}
+.PATH: ${NETBSDSRCDIR}/sbin/${p}
SRCS+= ${p}.c
MAN+= ${p}.8
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/${p}
diff -r b38d5fe1e101 -r 9d839924d1b4 sbin/mount_ados/Makefile
--- a/sbin/mount_ados/Makefile Mon Aug 19 10:11:42 2002 +0000
+++ b/sbin/mount_ados/Makefile Mon Aug 19 10:16:51 2002 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2000/10/30 20:56:58 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:55 lukem Exp $
+
+.include <bsd.own.mk>
PROG= mount_ados
SRCS= mount_ados.c getmntopts.c fattr.c
MAN= mount_ados.8
-MOUNT= ${.CURDIR}/../mount
Home |
Main Index |
Thread Index |
Old Index