| 1 | --- sys.mk Wed Oct 20 16:45:42 2004 |
|
|
| 2 | +++ sys.mk.orig Wed Oct 20 15:05:43 2004 |
1 | --- sys.mk.orig Wed Oct 20 15:05:43 2004 |
|
|
2 | +++ sys.mk Wed Oct 20 16:45:42 2004 |
| 3 | @@ -253,17 +253,17 @@ |
3 | @@ -253,17 +253,17 @@ |
| 4 | |
4 | |
| 5 | .endif |
5 | .endif |
| 6 | |
6 | |
| 7 | -#__MAKE_CONF?=/etc/make.conf |
7 | -__MAKE_CONF?=/etc/make.conf |
| 8 | -#.if exists(${__MAKE_CONF}) |
8 | -.if exists(${__MAKE_CONF}) |
| 9 | -#.include "${__MAKE_CONF}" |
9 | -.include "${__MAKE_CONF}" |
| 10 | -#.endif |
10 | -.endif |
| 11 | +__MAKE_CONF?=/etc/make.conf |
11 | +#__MAKE_CONF?=/etc/make.conf |
| 12 | +.if exists(${__MAKE_CONF}) |
12 | +#.if exists(${__MAKE_CONF}) |
| 13 | +.include "${__MAKE_CONF}" |
13 | +#.include "${__MAKE_CONF}" |
| 14 | +.endif |
14 | +#.endif |
| 15 | |
15 | |
| 16 | .include <bsd.cpu.mk> |
16 | .include <bsd.cpu.mk> |
| 17 | |
17 | |
| 18 | -#.if exists(/etc/make.conf.local) |
18 | -.if exists(/etc/make.conf.local) |
| 19 | -#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. |
19 | -.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. |
| 20 | -#.include </etc/make.conf.local> |
20 | -.include </etc/make.conf.local> |
| 21 | -#.endif |
21 | -.endif |
| 22 | +.if exists(/etc/make.conf.local) |
22 | +#.if exists(/etc/make.conf.local) |
| 23 | +.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. |
23 | +#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. |
| 24 | +.include </etc/make.conf.local> |
24 | +#.include </etc/make.conf.local> |
| 25 | +.endif |
25 | +#.endif |
| 26 | |
26 | |
| 27 | # Default executable format |
27 | # Default executable format |
| 28 | # XXX hint for bsd.port.mk |
28 | # XXX hint for bsd.port.mk |
Parent Directory
| 
Revision Log
| 
Patch