[src/trunk]: src/distrib/utils dependencies on BSDSRCDIR should be _removed_, ...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fa778a90397
branches:  trunk
changeset: 473895:6fa778a90397
user:      cgd <cgd%NetBSD.org@localhost>
date:      Mon Jun 21 01:19:36 1999 +0000

description:
dependencies on BSDSRCDIR should be _removed_, not introduced.  Use
paths relative to ${.CURDIR} instead.  Using BSDSRCDIR here means that
it's impossible to compile these programs out of the source tree they're
a part of, unless that sort tree happens to be the one at BSDSRCDIR.

diffstat:

 distrib/utils/init_s/Makefile     |  4 ++--
 distrib/utils/x_dd/Makefile       |  4 ++--
 distrib/utils/x_ftp/Makefile      |  4 ++--
 distrib/utils/x_ifconfig/Makefile |  4 ++--
 distrib/utils/x_netstat/Makefile  |  4 ++--
 distrib/utils/x_route/Makefile    |  4 ++--
 distrib/utils/x_sh/Makefile       |  4 ++--
 distrib/utils/zcat/Makefile       |  4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diffs (135 lines):

diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/init_s/Makefile
--- a/distrib/utils/init_s/Makefile     Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/init_s/Makefile     Mon Jun 21 01:19:36 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:49 gwr Exp $
+# $NetBSD: Makefile,v 1.8 1999/06/21 01:19:36 cgd Exp $
 # Build a "small init" (i.e. for boot media)
 
 PROG=  init
@@ -8,7 +8,7 @@
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
-SRCDIR= ${BSDSRCDIR}/sbin/init
+SRCDIR= ${.CURDIR}/../../../sbin/init
 CPPFLAGS+= -DLETS_GET_SMALL -I${SRCDIR}
 
 all: ${PROG}
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_dd/Makefile
--- a/distrib/utils/x_dd/Makefile       Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_dd/Makefile       Mon Jun 21 01:19:36 1999 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr Exp $
+# $NetBSD: Makefile,v 1.8 1999/06/21 01:19:36 cgd Exp $
 # Build a smaller dd (i.e. for boot media)
 
 PROG=  dd
 MKMAN= no
 
-SRCDIR= ${BSDSRCDIR}/bin/dd
+SRCDIR= ${.CURDIR}/../../../bin/dd
 
 SRCS=  args.c conv.c dd.c misc.c position.c
 # SRCS+= conv_tab.c (not used)
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_ftp/Makefile
--- a/distrib/utils/x_ftp/Makefile      Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_ftp/Makefile      Mon Jun 21 01:19:36 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/05/19 04:17:50 gwr Exp $
+# $NetBSD: Makefile,v 1.5 1999/06/21 01:19:36 cgd Exp $
 # Build a smaller ftp (i.e. for boot media)
 
 PROG=  ftp
@@ -8,7 +8,7 @@
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
-SRCDIR= ${BSDSRCDIR}/usr.bin/ftp
+SRCDIR= ${.CURDIR}/../../../usr.bin/ftp
 
 SRCS=  cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
        util.c
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_ifconfig/Makefile
--- a/distrib/utils/x_ifconfig/Makefile Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_ifconfig/Makefile Mon Jun 21 01:19:36 1999 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr Exp $
+# $NetBSD: Makefile,v 1.8 1999/06/21 01:19:37 cgd Exp $
 # Build a smaller ifconfig (i.e. for boot media)
 
 PROG=  ifconfig
 MKMAN= no
 
-SRCDIR= ${BSDSRCDIR}/sbin/ifconfig
+SRCDIR= ${.CURDIR}/../../../sbin/ifconfig
 CPPFLAGS+= -DINET_ONLY -I${SRCDIR}
 
 all: ${PROG}
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_netstat/Makefile
--- a/distrib/utils/x_netstat/Makefile  Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_netstat/Makefile  Mon Jun 21 01:19:36 1999 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.4 1999/05/23 10:25:43 veego Exp $
+#      $NetBSD: Makefile,v 1.5 1999/06/21 01:19:37 cgd Exp $
 
 PROG=  netstat
 SRCS=  if.c inet.c main.c mbuf.c route.c
 
-SRCDIR= ${BSDSRCDIR}/usr.bin/netstat
+SRCDIR= ${.CURDIR}/../../../usr.bin/netstat
 CPPFLAGS+= -DSMALL -I${SRCDIR}
 LDADD= -lkvm
 DPADD= ${LIBKVM}
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_route/Makefile
--- a/distrib/utils/x_route/Makefile    Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_route/Makefile    Mon Jun 21 01:19:36 1999 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 1999/05/19 04:17:50 gwr Exp $
+#      $NetBSD: Makefile,v 1.6 1999/06/21 01:19:37 cgd Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 PROG=  route
 MKMAN= no
 SRCS=  route.c show.c keywords.c
 
-SRCDIR= ${BSDSRCDIR}/sbin/route
+SRCDIR= ${.CURDIR}/../../../sbin/route
 CPPFLAGS+= -DSMALL -I${SRCDIR}
 
 BINOWN=        root
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/x_sh/Makefile
--- a/distrib/utils/x_sh/Makefile       Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/x_sh/Makefile       Mon Jun 21 01:19:36 1999 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.9 1999/05/19 04:17:50 gwr Exp $
+#      $NetBSD: Makefile,v 1.10 1999/06/21 01:19:38 cgd Exp $
 # Build a smaller sh (e.g. for boot media)
 
 .include <bsd.own.mk>
 
 MKMAN=no
 
-SRCDIR= ${BSDSRCDIR}/bin/sh
+SRCDIR= ${.CURDIR}/../../../bin/sh
 
 CPPFLAGS+= -I${SRCDIR} -DSMALL
 
diff -r 33b87f77f132 -r 6fa778a90397 distrib/utils/zcat/Makefile
--- a/distrib/utils/zcat/Makefile       Sun Jun 20 22:07:28 1999 +0000
+++ b/distrib/utils/zcat/Makefile       Mon Jun 21 01:19:36 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr Exp $
+# $NetBSD: Makefile,v 1.8 1999/06/21 01:19:38 cgd Exp $
 # Small zcat (i.e. for install media)
 #
 # Note: gzio.c is compiled here so that crunchgen will assume
@@ -10,7 +10,7 @@
 MKMAN= no
 SRCS=  zcat.c gzio.c
 
-SRCDIR= ${BSDSRCDIR}/lib/libz
+SRCDIR= ${.CURDIR}/../../../lib/libz
 CPPFLAGS+= -I${SRCDIR}
 
 DPADD+=        ${LIBZ}