summaryrefslogtreecommitdiffstats
path: root/etc/Makefile
diff options
context:
space:
mode:
authoralex <alex@FreeBSD.org>2001-08-30 22:44:51 +0000
committeralex <alex@FreeBSD.org>2001-08-30 22:44:51 +0000
commit1b28c0b3578872bb4b42c4f04207e8d0a8d4c048 (patch)
tree95231063ab5b14bec041d37cd0b872a69e050cc4 /etc/Makefile
parentd7989a71f9890fed92149bf76637af86738631a4 (diff)
downloadFreeBSD-src-1b28c0b3578872bb4b42c4f04207e8d0a8d4c048.zip
FreeBSD-src-1b28c0b3578872bb4b42c4f04207e8d0a8d4c048.tar.gz
Move /etc/defaults/make.conf to /usr/share/examples/etc/make.conf as
discussed on the arch@ mailinglist (after repo-copy). sys.mk will .error if it finds /etc/defaults/make.conf but include it anyways (this is the same behaviour as with the make.conf.local removal). /usr/share/examples/etc/make.conf has BDEFLAGS commented out now, since it's only an example file. Adjust all textes that talk about make.conf or defaults/make.conf to match the new situation.
Diffstat (limited to 'etc/Makefile')
-rw-r--r--etc/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile
index c94460f..4dc612f 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -68,7 +68,6 @@ distribution:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN2} ${DESTDIR}/etc; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/rc.conf ${DESTDIR}/etc/defaults/; \
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/make.conf ${DESTDIR}/etc/defaults/; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/pccard.conf ${DESTDIR}/etc/defaults/; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/periodic.conf ${DESTDIR}/etc/defaults/; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
@@ -203,8 +202,6 @@ etc-examples:
opieaccess ${DESTDIR}/usr/share/examples/etc; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/rc.conf \
${DESTDIR}/usr/share/examples/etc/defaults; \
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/make.conf \
- ${DESTDIR}/usr/share/examples/etc/defaults; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/pccard.conf \
${DESTDIR}/usr/share/examples/etc/defaults; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/periodic.conf \
OpenPOWER on IntegriCloud