aboutsummaryrefslogtreecommitdiff
path: root/sbin/ldconfig/ldconfig.8
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1995-06-24 10:08:44 +0000
committerSatoshi Asami <asami@FreeBSD.org>1995-06-24 10:08:44 +0000
commitf606c848fa4c2b07aff750b92c803d61f11d5e07 (patch)
tree9c7b8484f6cb6819ab8c960c8bd213983acca4c8 /sbin/ldconfig/ldconfig.8
parent13cf82d487f2ae2952ba7c438e7ca13b07b6ade1 (diff)
downloadsrc-f606c848fa4c2b07aff750b92c803d61f11d5e07.tar.gz
src-f606c848fa4c2b07aff750b92c803d61f11d5e07.zip
Add an "-m" flag to merge instead of replace the entries. We can
now safely add a line like ldconfig -m ${PREFIX}/lib in ports' Makefiles and packing lists without throwing away some directories the user may have added. Submitted by: Mostly by Paul Kranenburg <pk@cs.few.eur.nl>
Notes
Notes: svn path=/head/; revision=9290
Diffstat (limited to 'sbin/ldconfig/ldconfig.8')
-rw-r--r--sbin/ldconfig/ldconfig.810
1 files changed, 8 insertions, 2 deletions
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 0a6cb695e1f5..9b8322456f0b 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id$
+.\" $Id: ldconfig.8,v 1.6 1994/12/23 22:31:21 nate Exp $
.\"
.Dd October 3, 1993
.Dt LDCONFIG 8
@@ -37,7 +37,7 @@
.Nd configure the shared library cache
.Sh SYNOPSIS
.Nm ldconfig
-.Op Fl rsv
+.Op Fl mrsv
.Op Ar directory Ar ...
.Sh DESCRIPTION
.Nm
@@ -82,6 +82,12 @@ is typically run as part of the boot sequence.
The following options recognized by
.Nm ldconfig:
.Bl -tag -width indent
+.It Fl m
+Instead of replacing the contents of
+.Xr ld.so.hints
+with those found in the directories specified,
+.Dq merge
+in new entries.
.It Fl r
Lists the current contents of
.Xr ld.so.hints