Merge branch 'master' of ssh://swildner@crater.dragonflybsd.org/repository/git/dragon...
authorSascha Wildner <saw@online.de>
Sun, 30 Nov 2008 20:16:53 +0000 (21:16 +0100)
committerSascha Wildner <saw@online.de>
Sun, 30 Nov 2008 20:16:53 +0000 (21:16 +0100)
Makefile.inc1
etc/Makefile

index 1e448f9..522ff76 100644 (file)
@@ -439,7 +439,7 @@ installcheck:
 #
 distributeworld installworld: installcheck
        cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
-       install -o root -g wheel -m 644 ${.CURDIR}/Makefile_upgrade.inc ${DESTDIR}/etc/upgrade/
+       ${INSTALL} -o root -g wheel -m 644 ${.CURDIR}/Makefile_upgrade.inc ${DESTDIR}/etc/upgrade/
 
 #
 # reinstall
index ea4857f..03a372f 100644 (file)
@@ -146,7 +146,13 @@ upgrade_etc:       preupgrade remove-obsolete-files
        cd ${UPGRADE_SRCDIR}; \
            ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
                ${BINUPDATE} ${DESTDIR}/etc; \
-           cap_mkdb ${DESTDIR}/etc/login.conf; \
+           cap_mkdb ${DESTDIR}/etc/login.conf
+.for BIN1_FILE in ${BIN1}
+.if !exists(${DESTDIR}/etc/${BIN1_FILE:T})
+           ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+               ${BIN1_FILE} ${DESTDIR}/etc
+.endif
+.endfor
            ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \
                ${BIN2} ${DESTDIR}/etc;
        cd ${UPGRADE_SRCDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \