diff options
| author | ru <ru@FreeBSD.org> | 2005-02-28 22:55:43 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2005-02-28 22:55:43 +0000 |
| commit | 8115657ff0bbed634a787daeeed108209d0a65b9 (patch) | |
| tree | 3b03b8434af34ffa5970aa3413735e217e86f03e | |
| parent | 881fdd1aeade7114ad8d3441739b0aeb0299b92b (diff) | |
| download | FreeBSD-src-8115657ff0bbed634a787daeeed108209d0a65b9.zip FreeBSD-src-8115657ff0bbed634a787daeeed108209d0a65b9.tar.gz | |
Bootstrap pwd_mkdb(8) and use its new feature during "make distribute".
| -rw-r--r-- | Makefile.inc1 | 7 | ||||
| -rw-r--r-- | etc/Makefile | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5273069..1eb8835 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -796,6 +796,10 @@ _mklocale= usr.bin/mklocale _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 600020 +_pwd_mkdb= usr.sbin/pwd_mkdb +.endif + bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -811,7 +815,8 @@ bootstrap-tools: usr.bin/rpcgen \ usr.bin/xinstall \ usr.sbin/config \ - ${_crunchgen} + ${_crunchgen} \ + ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ diff --git a/etc/Makefile b/etc/Makefile index b960424..627f216 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -76,8 +76,10 @@ distribute: .include <bsd.endian.mk> .if ${TARGET_ENDIANNESS} == "1234" CAP_MKDB_ENDIAN= -l +PWD_MKDB_ENDIAN= -L .elif ${TARGET_ENDIANNESS} == "4321" CAP_MKDB_ENDIAN= -b +PWD_MKDB_ENDIAN= -B .else CAP_MKDB_ENDIAN= .endif @@ -91,7 +93,8 @@ distribution: ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ - pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd + pwd_mkdb ${PWD_MKDB_ENDIAN} -p -d ${DESTDIR}/etc \ + ${DESTDIR}/etc/master.passwd cd ${.CURDIR}/bluetooth; ${MAKE} install cd ${.CURDIR}/defaults; ${MAKE} install cd ${.CURDIR}/periodic; ${MAKE} install |
