]> Zhao Yanbai Git Server - minix.git/commitdiff
make etcfiles: small fix in Makefile
authorAntoine Leca <Antoine.Leca.1@gmail.com>
Wed, 23 Jan 2013 16:54:41 +0000 (16:54 +0000)
committerLionel Sambuc <lionel@minix3.org>
Wed, 6 Mar 2013 17:12:29 +0000 (18:12 +0100)
Keep the MKUNPRIVED=yes stuff with the installation
of master.passwd, i.e. away from make etcfiles

etc/Makefile

index 98e2b56f4292467943d450e7191998bcb5bb0282..9e5d25fe411fbc00b52a4a8cc54a8c8bf7493782 100644 (file)
@@ -324,6 +324,13 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
            master.passwd ${DESTDIR}/etc
        ${TOOL_PWD_MKDB} -p ${PWD_MKDB_ENDIAN} -d ${DESTDIR}/ \
            ${DESTDIR}/etc/master.passwd
+.if ${MKUNPRIVED} != "no"
+       ( \
+               for metaent in passwd pwd.db spwd.db; do \
+                       echo "./etc/$${metaent} type=file mode=0644 uname=root gname=operator tags=etc_pkg"; \
+               done; \
+       ) | ${METALOG.add}
+.endif # MKUNPRIVED != no
 .if defined(__MINIX)
 # LSC: We need a safe install target for etc files, as this is expected from
 # our current user base. This safe version only leaves out the master.passwd
@@ -341,13 +348,6 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 # LSC Minix administrator group is operator, not wheel
 .endif # defined(__MINIX)
-.if ${MKUNPRIVED} != "no"
-       ( \
-               for metaent in passwd pwd.db spwd.db; do \
-                       echo "./etc/$${metaent} type=file mode=0644 uname=root gname=operator tags=etc_pkg"; \
-               done; \
-       ) | ${METALOG.add}
-.endif # MKUNPRIVED != no
        ${_MKMSG_INSTALL} ${DESTDIR}/etc/ttys
 .if !defined(__MINIX)
        ${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \