diff options
| author | dillon <dillon@FreeBSD.org> | 1999-10-27 19:24:49 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 1999-10-27 19:24:49 +0000 |
| commit | 8a143f23311fa4196bfe6b9c9729f6603c106e2e (patch) | |
| tree | c6218d1b45911de1c9c4e2018c1659ad339f5120 | |
| parent | 58aa98c8a52ccd438ba3ce743a870e7080120e49 (diff) | |
| download | FreeBSD-src-8a143f23311fa4196bfe6b9c9729f6603c106e2e.zip FreeBSD-src-8a143f23311fa4196bfe6b9c9729f6603c106e2e.tar.gz | |
make.conf is being made to conform to the /etc/defaults/ standard that
was settled on a few months ago.
Approved by: "Jordan K. Hubbard" <jkh@zippy.cdrom.com>
| -rw-r--r-- | share/mk/sys.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index abdc9f9..3be1291 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -236,11 +236,16 @@ HTAGSFLAGS= .endif +.if exists(/etc/defaults/make.conf) +.include </etc/defaults/make.conf> +.endif + .if exists(/etc/make.conf) .include </etc/make.conf> .endif .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. .include </etc/make.conf.local> .endif |
