summaryrefslogtreecommitdiffstats
path: root/etc/Makefile
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2004-03-14 17:18:39 +0000
committerru <ru@FreeBSD.org>2004-03-14 17:18:39 +0000
commit49840535480459dfac02d861688ee858e596bde3 (patch)
tree0b96e06929811abad54c694160d39fe2c35d1286 /etc/Makefile
parenta19d925625431555d642b4b5ea729b75f9a61b8d (diff)
downloadFreeBSD-src-49840535480459dfac02d861688ee858e596bde3.zip
FreeBSD-src-49840535480459dfac02d861688ee858e596bde3.tar.gz
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.
Diffstat (limited to 'etc/Makefile')
-rw-r--r--etc/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile
index d43237a..dae97ca 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}/
OpenPOWER on IntegriCloud