[src/trunk]: src/distrib/utils Things in distrib/utils need to know BSDSRCDIR...

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

details:   https://anonhg.NetBSD.org/src/rev/64e169807618
branches:  trunk
changeset: 473069:64e169807618
user:      gwr <gwr%NetBSD.org@localhost>
date:      Wed May 19 04:17:49 1999 +0000

description:
Things in distrib/utils need to know BSDSRCDIR anway,
so we might as well use it.  Lots simpler.

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       |  22 ++--------------------
 distrib/utils/zcat/Makefile       |   4 ++--
 8 files changed, 16 insertions(+), 34 deletions(-)

diffs (153 lines):

diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/init_s/Makefile
--- a/distrib/utils/init_s/Makefile     Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/init_s/Makefile     Wed May 19 04:17:49 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:18 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:49 gwr Exp $
 # Build a "small init" (i.e. for boot media)
 
 PROG=  init
@@ -8,7 +8,7 @@
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
-SRCDIR= ${.CURDIR}/../../../sbin/init
+SRCDIR= ${BSDSRCDIR}/sbin/init
 CPPFLAGS+= -DLETS_GET_SMALL -I${SRCDIR}
 
 all: ${PROG}
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_dd/Makefile
--- a/distrib/utils/x_dd/Makefile       Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_dd/Makefile       Wed May 19 04:17:49 1999 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr Exp $
 # Build a smaller dd (i.e. for boot media)
 
 PROG=  dd
 MKMAN= no
 
-SRCDIR= ${.CURDIR}/../../../bin/dd
+SRCDIR= ${BSDSRCDIR}/bin/dd
 
 SRCS=  args.c conv.c dd.c misc.c position.c
 # SRCS+= conv_tab.c (not used)
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_ftp/Makefile
--- a/distrib/utils/x_ftp/Makefile      Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_ftp/Makefile      Wed May 19 04:17:49 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:19 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/19 04:17:50 gwr Exp $
 # Build a smaller ftp (i.e. for boot media)
 
 PROG=  ftp
@@ -8,7 +8,7 @@
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
-SRCDIR= ${.CURDIR}/../../../usr.bin/ftp
+SRCDIR= ${BSDSRCDIR}/usr.bin/ftp
 
 SRCS=  cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
        util.c
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_ifconfig/Makefile
--- a/distrib/utils/x_ifconfig/Makefile Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_ifconfig/Makefile Wed May 19 04:17:49 1999 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr Exp $
 # Build a smaller ifconfig (i.e. for boot media)
 
 PROG=  ifconfig
 MKMAN= no
 
-SRCDIR= ${.CURDIR}/../../../sbin/ifconfig
+SRCDIR= ${BSDSRCDIR}/sbin/ifconfig
 CPPFLAGS+= -DINET_ONLY -I${SRCDIR}
 
 all: ${PROG}
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_netstat/Makefile
--- a/distrib/utils/x_netstat/Makefile  Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_netstat/Makefile  Wed May 19 04:17:49 1999 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 1999/02/13 02:54:19 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 1999/05/19 04:17:50 gwr Exp $
 
 PROG=  netstat
 SRCS=  if.c inet.c main.c mbuf.c route.c
 
-SRCDIR= ${.CURDIR}/../../../usr.bin/netstat
+SRCDIR= ${BSDSRCDIR}/usr.bin/netstat
 CPPFLAGS+= -DSMALL -I${SRCDIR}
 LDADD= -lkvm
 DPADD= ${LIBKVM}
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_route/Makefile
--- a/distrib/utils/x_route/Makefile    Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_route/Makefile    Wed May 19 04:17:49 1999 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 1999/02/13 02:54:19 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 1999/05/19 04:17:50 gwr Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 PROG=  route
 MKMAN= no
 SRCS=  route.c show.c keywords.c
 
-SRCDIR= ${.CURDIR}/../../../sbin/route
+SRCDIR= ${BSDSRCDIR}/sbin/route
 CPPFLAGS+= -DSMALL -I${SRCDIR}
 
 BINOWN=        root
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/x_sh/Makefile
--- a/distrib/utils/x_sh/Makefile       Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/x_sh/Makefile       Wed May 19 04:17:49 1999 +0000
@@ -1,29 +1,11 @@
-#      $NetBSD: Makefile,v 1.8 1999/02/13 02:54:19 lukem Exp $
+#      $NetBSD: Makefile,v 1.9 1999/05/19 04:17:50 gwr Exp $
 # Build a smaller sh (e.g. for boot media)
-#
-# Be very careful before attempting to "clean up" the ugly location
-# of the bin/sh source directory. The problem is that crunchgen(1)
-# doesn't run from this directory, thus creating a triple-indirect
-# sh Makefile include and requiring the whole thing to work from
-# different levels in the tree.
-# 
-# We could just use only the BSDSRCDIR assignment, but right now the use
-# of BSDSRCDIR can be deleted here, and so I didn't want to depend on it
-# in case someday we completely nuke the rarely used BSDSRCDIR.
 
 .include <bsd.own.mk>
 
 MKMAN=no
 
-.for i in     ../../bin/sh             \
-          ../../../bin/sh              \
-       ../../../../bin/sh
-.if exists(${.CURDIR:H}/$i/Makefile)
-SRCDIR?= ${.CURDIR:H}/$i
-.endif
-.endfor
-
-SRCDIR?= ${BSDSRCDIR}/bin/sh
+SRCDIR= ${BSDSRCDIR}/bin/sh
 
 CPPFLAGS+= -I${SRCDIR} -DSMALL
 
diff -r 4db56adc74a6 -r 64e169807618 distrib/utils/zcat/Makefile
--- a/distrib/utils/zcat/Makefile       Wed May 19 03:58:13 1999 +0000
+++ b/distrib/utils/zcat/Makefile       Wed May 19 04:17:49 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/19 04:17:50 gwr 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= ${.CURDIR}/../../../lib/libz
+SRCDIR= ${BSDSRCDIR}/lib/libz
 CPPFLAGS+= -I${SRCDIR}
 
 DPADD+=        ${LIBZ}