diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-06-09 19:14:27 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-06-09 19:14:27 +0000 |
| commit | 3adc74c768226112b373d0bcacee73521b0aed2a (patch) | |
| tree | 16a54540a7fb71a7c91fd866ad2437410acbf587 /etc | |
| parent | 16e7cc26b92bfce95d9235055175bca313845189 (diff) | |
| parent | 019098cfd4f55d00b6c91a8a36d49811f2705a57 (diff) | |
| download | src-3adc74c768226112b373d0bcacee73521b0aed2a.tar.gz src-3adc74c768226112b373d0bcacee73521b0aed2a.zip | |
Merged ^/head r283871 through r284187.
Notes
Notes:
svn path=/projects/clang-trunk/; revision=284188
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile index e5195f67b7dc..7f0ca56aae02 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -188,13 +188,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?= -PWD_MKDB_ENDIAN?= .endif .if defined(NO_ROOT) @@ -210,6 +207,8 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \ + services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ + ${DESTDIR}/etc/services; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ @@ -220,8 +219,7 @@ distribution: .if ${MK_TCSH} == "no" sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd .endif - pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ - ${DESTDIR}/etc/master.passwd + pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd .if defined(NO_ROOT) ( \ echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \ |