summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/defaults/make.conf34
-rw-r--r--etc/fbtab4
-rw-r--r--etc/make.conf34
-rw-r--r--etc/manpath.config8
-rw-r--r--share/examples/etc/make.conf34
5 files changed, 77 insertions, 37 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 6edbb41..c60f16c 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,22 +1,23 @@
-# $Id: make.conf,v 1.9 1994/09/19 02:02:55 ache Exp $
+# $Id: make.conf,v 1.6 1994/09/20 22:30:33 adam Exp $
#
-# This file, if present, will be read by make (see /usr/share/mk/sys.mk)
-# It allows you to override macro definitions to make, without changing
-# in your source tree, or anything the source tree installs.
+# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
+# It allows you to override macro definitions to make without changing
+# your source tree, or anything the source tree installs.
+#
+# This file must be in valid Makefile syntax.
#
# You have to find the things you can put here in the Makefiles and
# documentation of the source tree.
#
-# This file must have a syntax as a Makefile.
-#
# One, and probably the most common, use could be:
#
#CFLAGS= -O -m486 -pipe
# A lot of people report that -O2 works fine, but there are known
-# bugs in gcc. -pipe will almost always speed up compilation.
+# bugs in gcc. -pipe will almost always speed up compilation if you
+# have enough memory.
#
#
-# Another useful entry could be:
+# Another useful entry is
#
#NOPROFILE= no_way
# Avoid compiling profiled libraries
@@ -47,10 +48,10 @@
#
# How many times to check if a key has been pressed before giving up and
# booting the default kernel. 0 actually means check once, but saves the
-# loop overhead. This value is approximately in 1/100ths of a second.
+# loop overhead. This value is approximately in milliseconds.
#
#BOOTWAIT=0
-#BOOTWAIT=3000
+#BOOTWAIT=30000
#
#
# Allow 'cc' to generate all FPU codes. Do not use this if you intend to
@@ -59,3 +60,16 @@
#
#CCFPU= yes
#
+#
+# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier.
+# If you have XFree86 3.0 or later, you will probably want to uncomment this:
+#
+#X11BASE= /usr/X11R6
+#
+#
+# Build `cc' using a static internals library, rather than the default
+# (dynamic) one. This makes the compilers run faster, but at a cost of
+# about a megabyte of disk space for every language other than C.
+#
+#NO_SHARED_LIBCC_INT= faster_cc
+#
diff --git a/etc/fbtab b/etc/fbtab
index 9c12c4f..c1bf054 100644
--- a/etc/fbtab
+++ b/etc/fbtab
@@ -1,2 +1,2 @@
-#/dev/ttyv0 0600 /dev/console
-#/dev/ttyv0 0600 /dev/pcaudio:/dev/pcaudioctl
+#/dev/ttyv0 0600 /dev/console
+#/dev/ttyv0 0600 /dev/pcaudio:/dev/pcaudioctl
diff --git a/etc/make.conf b/etc/make.conf
index 6edbb41..c60f16c 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,22 +1,23 @@
-# $Id: make.conf,v 1.9 1994/09/19 02:02:55 ache Exp $
+# $Id: make.conf,v 1.6 1994/09/20 22:30:33 adam Exp $
#
-# This file, if present, will be read by make (see /usr/share/mk/sys.mk)
-# It allows you to override macro definitions to make, without changing
-# in your source tree, or anything the source tree installs.
+# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
+# It allows you to override macro definitions to make without changing
+# your source tree, or anything the source tree installs.
+#
+# This file must be in valid Makefile syntax.
#
# You have to find the things you can put here in the Makefiles and
# documentation of the source tree.
#
-# This file must have a syntax as a Makefile.
-#
# One, and probably the most common, use could be:
#
#CFLAGS= -O -m486 -pipe
# A lot of people report that -O2 works fine, but there are known
-# bugs in gcc. -pipe will almost always speed up compilation.
+# bugs in gcc. -pipe will almost always speed up compilation if you
+# have enough memory.
#
#
-# Another useful entry could be:
+# Another useful entry is
#
#NOPROFILE= no_way
# Avoid compiling profiled libraries
@@ -47,10 +48,10 @@
#
# How many times to check if a key has been pressed before giving up and
# booting the default kernel. 0 actually means check once, but saves the
-# loop overhead. This value is approximately in 1/100ths of a second.
+# loop overhead. This value is approximately in milliseconds.
#
#BOOTWAIT=0
-#BOOTWAIT=3000
+#BOOTWAIT=30000
#
#
# Allow 'cc' to generate all FPU codes. Do not use this if you intend to
@@ -59,3 +60,16 @@
#
#CCFPU= yes
#
+#
+# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier.
+# If you have XFree86 3.0 or later, you will probably want to uncomment this:
+#
+#X11BASE= /usr/X11R6
+#
+#
+# Build `cc' using a static internals library, rather than the default
+# (dynamic) one. This makes the compilers run faster, but at a cost of
+# about a megabyte of disk space for every language other than C.
+#
+#NO_SHARED_LIBCC_INT= faster_cc
+#
diff --git a/etc/manpath.config b/etc/manpath.config
index 677b1ad..f6e6d68 100644
--- a/etc/manpath.config
+++ b/etc/manpath.config
@@ -10,15 +10,14 @@
#
# MANBIN is optional
#
-#MANBIN /usr/local/bin/man
+#MANBIN /usr/bin/man
#
# every automatically generated MANPATH includes these fields
#
MANDATORY_MANPATH /usr/share/man
MANDATORY_MANPATH /usr/local/man
MANDATORY_MANPATH /usr/X386/man
-MANDATORY_MANPATH /usr/X11R6/man
-MANDATORY_MANPATH /usr/gnu/man
+#MANDATORY_MANPATH /usr/X11R6/man
#
# set up PATH to MANPATH mapping
#
@@ -27,6 +26,5 @@ MANPATH_MAP /usr/bin /usr/share/man
MANPATH_MAP /usr/ucb /usr/share/man
MANPATH_MAP /usr/local/mh /usr/local/mh/man
MANPATH_MAP /usr/local/bin /usr/local/man
-MANPATH_MAP /usr/gnu /usr/gnu/man
MANPATH_MAP /usr/X386/bin /usr/X386/man
-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
+#MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6edbb41..c60f16c 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,22 +1,23 @@
-# $Id: make.conf,v 1.9 1994/09/19 02:02:55 ache Exp $
+# $Id: make.conf,v 1.6 1994/09/20 22:30:33 adam Exp $
#
-# This file, if present, will be read by make (see /usr/share/mk/sys.mk)
-# It allows you to override macro definitions to make, without changing
-# in your source tree, or anything the source tree installs.
+# This file, if present, will be read by make (see /usr/share/mk/sys.mk).
+# It allows you to override macro definitions to make without changing
+# your source tree, or anything the source tree installs.
+#
+# This file must be in valid Makefile syntax.
#
# You have to find the things you can put here in the Makefiles and
# documentation of the source tree.
#
-# This file must have a syntax as a Makefile.
-#
# One, and probably the most common, use could be:
#
#CFLAGS= -O -m486 -pipe
# A lot of people report that -O2 works fine, but there are known
-# bugs in gcc. -pipe will almost always speed up compilation.
+# bugs in gcc. -pipe will almost always speed up compilation if you
+# have enough memory.
#
#
-# Another useful entry could be:
+# Another useful entry is
#
#NOPROFILE= no_way
# Avoid compiling profiled libraries
@@ -47,10 +48,10 @@
#
# How many times to check if a key has been pressed before giving up and
# booting the default kernel. 0 actually means check once, but saves the
-# loop overhead. This value is approximately in 1/100ths of a second.
+# loop overhead. This value is approximately in milliseconds.
#
#BOOTWAIT=0
-#BOOTWAIT=3000
+#BOOTWAIT=30000
#
#
# Allow 'cc' to generate all FPU codes. Do not use this if you intend to
@@ -59,3 +60,16 @@
#
#CCFPU= yes
#
+#
+# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier.
+# If you have XFree86 3.0 or later, you will probably want to uncomment this:
+#
+#X11BASE= /usr/X11R6
+#
+#
+# Build `cc' using a static internals library, rather than the default
+# (dynamic) one. This makes the compilers run faster, but at a cost of
+# about a megabyte of disk space for every language other than C.
+#
+#NO_SHARED_LIBCC_INT= faster_cc
+#
OpenPOWER on IntegriCloud