[src/trunk]: src/distrib/pc532/floppies/inst-common Don't try to build our ow...

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

details:   https://anonhg.NetBSD.org/src/rev/9b820624e631
branches:  trunk
changeset: 471749:9b820624e631
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Apr 10 03:59:58 1999 +0000

description:
Don't try to build our own pwd_mkdb when building the diskimage.

diffstat:

 distrib/pc532/floppies/inst-common/Makefile.inc |  12 ++----------
 distrib/pc532/floppies/inst-common/list         |   8 +++-----
 2 files changed, 5 insertions(+), 15 deletions(-)

diffs (62 lines):

diff -r 6856c1bac5ac -r 9b820624e631 distrib/pc532/floppies/inst-common/Makefile.inc
--- a/distrib/pc532/floppies/inst-common/Makefile.inc   Sat Apr 10 02:17:21 1999 +0000
+++ b/distrib/pc532/floppies/inst-common/Makefile.inc   Sat Apr 10 03:59:58 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 1999/03/04 20:32:20 wrstuden Exp $ 
+#      $NetBSD: Makefile.inc,v 1.12 1999/04/10 03:59:58 simonb Exp $ 
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -18,12 +18,6 @@
 CRUNCHCONF=    ${COMMONDIR}/${CBIN}.conf
 MTREE=         ${COMMONDIR}/mtree.conf
 ADIR=          ${TOP}/../../../sys/arch/pc532
-PWDSRC=                ${TOP}/../../../usr.sbin/pwd_mkdb
-.if exists(${PWDSRC}/obj)
-PWDOBJ=                ${PWDSRC}/obj
-.else
-PWDOBJ=                ${PWDSRC}
-.endif
 
 DISKTYPE=      boot3
 RAMDISKTYPE=   rd
@@ -45,8 +39,6 @@
            -c "exit" ${.OBJDIR}/${IMAGE} 2>/dev/null >/dev/null
 
 ramdisk.fs: ${CBIN} ${LISTS}
-       (cd ${PWDSRC}; ${MAKE})
-       ${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o -lutil
 .ifndef SD
        dd if=/dev/zero of=${.TARGET} bs=128k count=16
        vnconfig -t ${RAMDISKTYPE} -v -c ${VND_CDEV} ${.TARGET}
@@ -93,7 +85,7 @@
 
 clean cleandir distclean:
        /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
-       /bin/rm -f netbsd* pwd_mkdb
+       /bin/rm -f netbsd*
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff -r 6856c1bac5ac -r 9b820624e631 distrib/pc532/floppies/inst-common/list
--- a/distrib/pc532/floppies/inst-common/list   Sat Apr 10 02:17:21 1999 +0000
+++ b/distrib/pc532/floppies/inst-common/list   Sat Apr 10 03:59:58 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.9 1998/01/06 04:45:27 perry Exp $
+#      $NetBSD: list,v 1.10 1999/04/10 03:59:58 simonb Exp $
 
 # copy the MAKEDEV script and make some devices
 COPY   ${DESTDIR}/dev/MAKEDEV  dev/MAKEDEV
@@ -13,10 +13,8 @@
 COPY   ${TOPDIR}/../../../etc/master.passwd    etc
 COPY   ${TOPDIR}/../../../etc/protocols        etc
 COPY   ${TOPDIR}/../../../etc/services         etc
-SPECIAL >etc/ppp/options
-COPY   ${OBJDIR}/pwd_mkdb      pwd_mkdb
-SPECIAL        /usr/sbin/chroot . ./pwd_mkdb -p /etc/master.passwd
-SPECIAL        /bin/rm pwd_mkdb
+SPECIAL        >etc/ppp/options
+SPECIAL        pwd_mkdb -p -d ./ etc/master.passwd
 
 # copy the crunched binary, link to it
 #COPY  ${OBJDIR}/netbsd.gz     netbsd.gz