===================================================================
RCS file: /cvs/openbsd/fill_chroot/fix_ldconfig,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -r1.3 -r1.8
--- openbsd/fill_chroot/fix_ldconfig	2005/12/21 19:14:12	1.3
+++ openbsd/fill_chroot/fix_ldconfig	2008/09/16 23:44:51	1.8
@@ -1,16 +1,23 @@
 #!/bin/sh
-# $RedRiver: fix_ldconfig,v 1.2 2005/12/21 18:16:03 andrew Exp $
+# $RedRiver: fix_ldconfig,v 1.7 2008/09/16 22:14:28 andrew Exp $
 
-CHROOT=${CHROOT:=/var/www}
-
-if [ ${CHROOT}"X" == "X" ]; then
+if [ X"${CHROOT}" == X"" ]; then
   echo No CHROOT Specified!
   exit 255
 fi
 
-mkdir -p ${CHROOT}/bin
 mkdir -p ${CHROOT}/var/run
 
-cp /sbin/ldconfig ${CHROOT}/bin
-chroot ${CHROOT} /bin/ldconfig /usr/local/lib
-rm -f ${CHROOT}/bin/ldconfig
+for p in /usr/lib /usr/X11R6/lib /usr/local/lib; do
+	if [ -d ${CHROOT}${p} ]; then
+		LD_PATH="${LD_PATH} ${p}"
+	fi
+done
+
+if [ ! X"${LD_PATH}" == X"" ]; then
+	cp /sbin/ldconfig ${CHROOT}
+	echo running: ldconfig ${LD_PATH}
+	chroot ${CHROOT} ldconfig ${LD_PATH}
+	#chroot ${CHROOT} ldconfig -r
+	rm -f ${CHROOT}/ldconfig
+fi