diff options
| author | alex <alex@FreeBSD.org> | 2001-08-30 22:44:51 +0000 |
|---|---|---|
| committer | alex <alex@FreeBSD.org> | 2001-08-30 22:44:51 +0000 |
| commit | 1b28c0b3578872bb4b42c4f04207e8d0a8d4c048 (patch) | |
| tree | 95231063ab5b14bec041d37cd0b872a69e050cc4 /share/mk | |
| parent | d7989a71f9890fed92149bf76637af86738631a4 (diff) | |
| download | FreeBSD-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 'share/mk')
| -rw-r--r-- | share/mk/sys.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
