Revert "FreeBSD: Add /usr/dt/lib to runtime linker"
authorJon Trulson <jon@radscan.com>
Tue, 25 Sep 2012 01:20:56 +0000 (19:20 -0600)
committerJon Trulson <jon@radscan.com>
Tue, 25 Sep 2012 01:20:56 +0000 (19:20 -0600)
This reverts commit 91f228411ea3017dd445aa3834c29fe970cfd94f.

Updated patch.

cde/admin/IntegTools/post_install/freebsd/configShlibs.src

index 101ca50d2bdb6f5c8e93eaf494214c599eb76694..3807af30cdfaa76e4760b99b6870dbd92913c7a1 100755 (executable)
@@ -78,8 +78,6 @@ FILESET=CDE-SHLIBS
 retval=0
 CDE_TOP=CDE_INSTALLATION_TOP
 CDE_CONF_TOP=CDE_CONFIGURATION_TOP
-LOCALBASE=/usr/local
-LDCONFIGFILE="${LOCALBASE}/libdata/ldconfig/cde"
 
   HandleOption $*
 
@@ -90,7 +88,6 @@ LDCONFIGFILE="${LOCALBASE}/libdata/ldconfig/cde"
 
     RemoveShlibFiles
 
-    rm -rf $LDCONFIGFILE
     /sbin/ldconfig -R
 
     VerifyInstalledFiles
@@ -100,8 +97,7 @@ LDCONFIGFILE="${LOCALBASE}/libdata/ldconfig/cde"
 
     MakeTheLink
 
-    echo "${DT_OPT}/lib" > $LDCONFIGFILE
-    /sbin/ldconfig -R
+    /sbin/ldconfig -m "${DT_TOP}/lib"
 
   elif [ "$OPERATION" = "verify" ]
   then