From a658d226d14a645bb5eaa507673e6b08a46d9867 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 24 Sep 2012 19:20:56 -0600 Subject: [PATCH] Revert "FreeBSD: Add /usr/dt/lib to runtime linker" This reverts commit 91f228411ea3017dd445aa3834c29fe970cfd94f. Updated patch. --- cde/admin/IntegTools/post_install/freebsd/configShlibs.src | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cde/admin/IntegTools/post_install/freebsd/configShlibs.src b/cde/admin/IntegTools/post_install/freebsd/configShlibs.src index 101ca50d..3807af30 100755 --- a/cde/admin/IntegTools/post_install/freebsd/configShlibs.src +++ b/cde/admin/IntegTools/post_install/freebsd/configShlibs.src @@ -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 -- 2.25.1