From 1b28c0b3578872bb4b42c4f04207e8d0a8d4c048 Mon Sep 17 00:00:00 2001
From: alex <alex@FreeBSD.org>
Date: Thu, 30 Aug 2001 22:44:51 +0000
Subject: 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.
---
 share/mk/sys.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'share/mk')

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index fa7a680..dec766c 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -245,6 +245,7 @@ HTAGSFLAGS=
 .endif
 
 .if exists(/etc/defaults/make.conf)
+.error Error, /etc/defaults/make.conf has been moved to /usr/share/examples/etc/make.conf and is not included any more.
 .include </etc/defaults/make.conf>
 .endif
 
@@ -255,7 +256,7 @@ HTAGSFLAGS=
 .include <bsd.cpu.mk>
 
 .if exists(/etc/make.conf.local)
-.error Error, original /etc/make.conf should be moved to the /etc/defaults/ directory and /etc/make.conf.local should be renamed to /etc/make.conf.
+.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
 .include </etc/make.conf.local>
 .endif
 
-- 
cgit v1.1