From: Peter Avalos <pavalos@theshell.com>
Date: Sun, 30 Nov 2008 18:23:19 +0000 (-0500)
Subject: Let make upgrade install new files in etc/ if they don't exist.
X-Git-Tag: v2.1.1~2^2~25^2
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cff1dd2c697a53e2d7a3855fdd41299cf54623c1

Let make upgrade install new files in etc/ if they don't exist.

Reviewed-by:	dillon, corecode
---

diff --git a/etc/Makefile b/etc/Makefile
index ea4857f8e5..03a372f5dc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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 \