Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/etc/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/etc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.219 retrieving revision 1.219.2.3 diff -u -p -r1.219 -r1.219.2.3 --- src/etc/Makefile 2002/05/04 19:43:57 1.219 +++ src/etc/Makefile 2002/06/11 16:15:57 1.219.2.3 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.219 2002/05/04 19:43:57 jdolecek Exp $ +# $NetBSD: Makefile,v 1.219.2.3 2002/06/11 16:15:57 lukem Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -106,25 +106,16 @@ BIN3+= hosts.equiv NAMEDB= 127 root.cache named.conf localhost loopback.v6 -.if make(release) || make(snapshot) || make(distribution) # { -# find out endianness of target and set proper flag for pwd_mkdb so that -# it creates database in same endianness -.if exists(${DESTDIR}/usr/include/sys/endian.h) -TARGET_ENDIANNESS!= \ - printf '\#include \n_BYTE_ORDER\n' | \ - ${CC} -I${DESTDIR}/usr/include -E - | tail -1 | awk '{print $$1}' -.else -TARGET_ENDIANNESS= -.endif - +.if make(install-etc-files) # { +.include .if ${TARGET_ENDIANNESS} == "1234" -TARGET_ENDIANNESS= -L +TARGET_ENDIANNESS= -L .elif ${TARGET_ENDIANNESS} == "4321" -TARGET_ENDIANNESS= -B +TARGET_ENDIANNESS= -B .else TARGET_ENDIANNESS= .endif -.endif # release || snapshot || distribution # } +.endif # install-etc-files # } obj: mkdir -p ${KERNOBJDIR} @@ -150,12 +141,12 @@ install-etc-files: check_DESTDIR ${PWD_MKDB} -p ${TARGET_ENDIANNESS} -d ${DESTDIR}/ \ ${DESTDIR}/etc/master.passwd .if defined(UNPRIVED) - echo "${DESTDIR}/etc/passwd type=file mode=0644 uname=root gname=wheel" \ - | sed -e 's|^/|./|g' -e 's|//|/|g' >>${METALOG} - echo "${DESTDIR}/etc/pwd.db type=file mode=0644 uname=root gname=wheel" \ - | sed -e 's|^/|./|g' -e 's|//|/|g' >>${METALOG} - echo "${DESTDIR}/etc/spwd.db type=file mode=0600 uname=root gname=wheel" \ - | sed -e 's|^/|./|g' -e 's|//|/|g' >>${METALOG} + ( \ + echo "/etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + echo "/etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ + echo "/etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ + ) | \ + sed -e "s|^/|./${DESTDIR}/|g" -e "s|//|/|g" | ${CAT} -l >>${METALOG} .endif # UNPRIVED ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev