Add a ldconfig_paths variable that specifies the shared library paths

to be given to ldconfig(8).

PR:		5178
Submitted by:	Evan Champion <evanc@synapse.net>

2 files changed, 8 insertions, 5 deletions

diff --git a/etc/rc b/etc/rc
index 836209f18cf2..cc9cc8b40265 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.140 1997/12/09 07:22:04 danny Exp $
+#	$Id: rc,v 1.141 1997/12/09 10:06:49 danny Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -227,9 +227,11 @@ fi
 # Make shared lib searching a little faster.  Leave /usr/lib first if you
 # add your own entries or you may come to grief.
 _LDC=/usr/lib
-if [ -d /usr/lib/compat ]; then _LDC="${_LDC} /usr/lib/compat" ; fi
-if [ -d /usr/X11R6/lib ]; then _LDC="${_LDC} /usr/X11R6/lib" ; fi
-if [ -d /usr/local/lib ]; then _LDC="${_LDC} /usr/local/lib" ; fi
+for i in $ldconfig_paths; do
+	if test -d $i; then
+		_LDC="${_LDC} $i"
+	fi
+done
 echo 'setting ldconfig path:' ${_LDC}
 ldconfig ${_LDC}
 
diff --git a/etc/rc.conf b/etc/rc.conf
index 75682c1de6e4..088f303cd9f4 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.34 1997/11/16 12:52:17 steve Exp $
+#	$Id: rc.conf,v 1.35 1997/12/14 12:30:59 jkh Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -136,6 +136,7 @@ ibcs2_enable="NO"	# Ibcs2 (SCO) emulation loaded at startup (or NO).
 linux_enable="NO"	# Linux emulation loaded at startup (or NO).
 rand_irqs="NO"		# Stir the entropy pool (like "5 11" or NO).
 clear_tmp_enable="NO"	# Clear /tmp at startup.
+ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib" # shared library search paths
 
 ##############################################################
 ### Allow local configuration override at the very end here ##