pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Create TOOLS_LDCONFIG and LDCONFIG variables ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a1fb5080f34
branches:  trunk
changeset: 496257:8a1fb5080f34
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 24 20:40:53 2005 +0000

description:
Create TOOLS_LDCONFIG and LDCONFIG variables that contain the actual
command that can be embedded into packages.  Calling a bare "ldconfig"
will still call the one in the tools directory, which always does the
right thing.

diffstat:

 mk/tools/ldconfig.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r a5cb0f3e78b9 -r 8a1fb5080f34 mk/tools/ldconfig.mk
--- a/mk/tools/ldconfig.mk      Fri Jun 24 20:37:38 2005 +0000
+++ b/mk/tools/ldconfig.mk      Fri Jun 24 20:40:53 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ldconfig.mk,v 1.3 2005/05/21 04:53:17 jlam Exp $
+# $NetBSD: ldconfig.mk,v 1.4 2005/06/24 20:40:53 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -40,14 +40,16 @@
 # ${TOOLS_DIR}/bin/ldconfig to be either the correct ldconfig tool or
 # a no-op.
 #
+# Create TOOLS_LDCONFIG and LDCONFIG variables that point to the actual
+# commands that can be embedded into packages.
+#
 .if !defined(TOOLS_PLATFORM.ldconfig)
 TOOLS_NOOP+=                   ldconfig
+TOOLS_LDCONFIG?=               ${TRUE}
 .else
 TOOLS_CREATE+=                 ldconfig
 TOOLS_REAL_CMD.ldconfig=       ${TOOLS_PLATFORM.ldconfig}
+TOOLS_LDCONFIG?=               ${TOOLS_REAL_CMD.ldconfig}
 .endif
 
-# Make ${LDCONFIG} call "ldconfig" through the PATH, which should find
-# the one under ${TOOLS_DIR}.
-#
-LDCONFIG?=     ldconfig
+LDCONFIG?=     ${TOOLS_LDCONFIG}



Home | Main Index | Thread Index | Old Index