src/etc/make.conf, branch upstream/2.1.5 FreeBSD source tree Merge very small, selected parts of this directory from HEAD. Mostly 1996-06-17T09:17:53+00:00 Jordan K. Hubbard jkh@FreeBSD.org 1996-06-17T09:17:53+00:00 ecfd1091beca55f574f3680c5c8b6eb2fb6a619d motivated by a desire to see the local_startup stuff work correctly for the packages collection in 2.1.5. 
motivated by a desire to see the local_startup stuff work correctly
for the packages collection in 2.1.5.
This 3rd mega-commit should hopefully bring us back to where we were. 1996-06-05T02:59:00+00:00 Jordan K. Hubbard jkh@FreeBSD.org 1996-06-05T02:59:00+00:00 78e55a1f29558e8be54566ead1e7be8ab9d45273 I can get it to `make world' succesfully, anyway! 
I can get it to `make world' succesfully, anyway!
Merge from HEAD, except: 1996-05-29T22:38:37+00:00 Jordan K. Hubbard jkh@FreeBSD.org 1996-05-29T22:38:37+00:00 5c6b0b391751cf944e107a5ddab480f5b3d82f51 Clients that used gnumalloc still do, despite the merge. We're not bringing phkmalloc over. Thread stuff left out. PCCARD support left out. 
	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
Change commented SUPFILE examples to reflect where the supfiles 1995-10-26T02:39:24+00:00 John Fieber jfieber@FreeBSD.org 1995-10-26T02:39:24+00:00 73b3929c3f5b8a17e81cbe7245fb0f25d2e53c11 actually are (share/examples/sup). Obtained from: -current 
actually are (share/examples/sup).
Obtained from: -current
Synced with main branch. 1995-09-29T19:56:27+00:00 David Greenman dg@FreeBSD.org 1995-09-29T19:56:27+00:00 6c140c9d4297ca2c286bc7111ea4bd6773ac1ae9 






Now rejoin this!
1995-07-13T09:21:13+00:00

Rodney W. Grimes
rgrimes@FreeBSD.org

1995-07-13T09:21:13+00:00

605931781be2d6a43dd99b112b8505fb81fe37e6

cvs update -j 1.19 make.conf; cvs commit





cvs update -j 1.19 make.conf; cvs commit







Document COPTFLAGS in addition to CFLAGS.
1995-04-23T13:03:24+00:00

Jordan K. Hubbard
jkh@FreeBSD.org

1995-04-23T13:03:24+00:00

a746536c51556009404165f622da9f354b1d0aac












make.conf doesn't postulate anything about libm now.
1995-03-21T02:55:33+00:00

Poul-Henning Kamp
phk@FreeBSD.org

1995-03-21T02:55:33+00:00

6950e7e24e30b596f378d05672037d7f614ebc8c












Take out obsolete KERBEROS_IV build variable.  Just eBones now.
1995-03-20T21:35:15+00:00

Jordan K. Hubbard
jkh@FreeBSD.org

1995-03-20T21:35:15+00:00

39ad1abd8958c3bc90accbe36cd59c3ac9cf1f9f

Submitted by:	Mark Murray <mark@grondar.za>





Submitted by:	Mark Murray <mark@grondar.za>







Now that the default for the shared gcc-internal lib changed, make this match.
1994-11-10T02:29:41+00:00

Poul-Henning Kamp
phk@FreeBSD.org

1994-11-10T02:29:41+00:00

9a4deb1b4a5fd70c72e803282dbc0dd561a00b2a