===================================================================
RCS file: /cvs/openbsd/fill_chroot/fix_ldconfig,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -r1.6 -r1.10
--- openbsd/fill_chroot/fix_ldconfig	2006/10/19 17:24:00	1.6
+++ openbsd/fill_chroot/fix_ldconfig	2011/08/09 01:13:54	1.10
@@ -1,26 +1,23 @@
 #!/bin/sh
-# $RedRiver: fix_ldconfig,v 1.5 2006/08/13 17:24:38 andrew Exp $
+# $AFresh1: fix_ldconfig,v 1.8 2008/09/16 22:44:51 andrew Exp $
 
-CHROOT=${CHROOT:=/var/www}
-
 if [ X"${CHROOT}" == X"" ]; then
   echo No CHROOT Specified!
   exit 255
 fi
 
-mkdir -p ${CHROOT}/bin
 mkdir -p ${CHROOT}/var/run
 
-for p in /usr/lib /usr/X11R6/lib /usr/local/lib; do
+for p in `ldconfig -r | awk '/search directories:/ { gsub(":", " ", $3); print $3 }'` ; do
 	if [ -d ${CHROOT}${p} ]; then
 		LD_PATH="${LD_PATH} ${p}"
 	fi
 done
 
 if [ ! X"${LD_PATH}" == X"" ]; then
-	cp /sbin/ldconfig ${CHROOT}/bin
-	echo running: /bin/ldconfig ${LD_PATH}
-	chroot ${CHROOT} /bin/ldconfig ${LD_PATH}
-	#chroot ${CHROOT} /bin/ldconfig -r
-	rm -f ${CHROOT}/bin/ldconfig
+	cp /sbin/ldconfig ${CHROOT}
+	echo running: ldconfig ${LD_PATH}
+	chroot ${CHROOT} ldconfig ${LD_PATH}
+	#chroot ${CHROOT} ldconfig -r
+	rm -f ${CHROOT}/ldconfig
 fi