From 920fa8dcbd15bac23dcb1f9610cac81cb1d9dbfe Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Sun, 14 Mar 2004 17:18:39 +0000 Subject: [PATCH] I believe most of /boot/device.hints out there are based (if not identical) on GENERIC.hints, hence the following change: Moved the creation of /boot/device.hints where it belongs. This should aid in merging GENERIC.hints changes to /boot/device.hints, using mergemaster(8) or a similar approach. --- etc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index d43237a5aab2..dae97ca4187e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -64,9 +64,6 @@ afterinstall: distribute: cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ - ${DISTDIR}/${DISTRIBUTION}/boot/device.hints distribution: cd ${.CURDIR}; \ @@ -162,6 +159,9 @@ distribution: ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ + ${DESTDIR}/boot/device.hints distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/