diff options
| author | rillig <rillig> | 2007-03-05 23:35:59 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-03-05 23:35:59 +0000 |
| commit | 2c82a8e1320326caca18e9c37c78ca78d0d623b4 (patch) | |
| tree | 6e3682135b0b9146da45c906d3b2eb8caf7c0e0a /mk | |
| parent | 55583ea497b7e7f02b0f5a3d3b3e4bf461080769 (diff) | |
| download | pkgsrc-2c82a8e1320326caca18e9c37c78ca78d0d623b4.tar.gz | |
Backed out the latest change because of:
http://mail-index.netbsd.org/pkgsrc-changes/2007/02/28/0009.html
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/pkg-config.mk | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk index 37d48b5917a..40d0cd8c835 100644 --- a/mk/tools/pkg-config.mk +++ b/mk/tools/pkg-config.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-config.mk,v 1.7 2007/02/23 02:49:56 rillig Exp $ +# $NetBSD: pkg-config.mk,v 1.8 2007/03/05 23:35:59 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -42,10 +42,8 @@ _PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig _PKG_CONFIG_LOG?= ${WRKDIR}/.pkg-config.log -.if !empty(USE_TOOLS:C/\:.*//:Mpkg-config) TOOLS_SCRIPT.pkg-config= \ PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} ${TOOLS_SCRIPT_DFLT.pkg-config} -.endif CONFIGURE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q} CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 4656cf3ad36..27835419a02 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.185 2007/02/23 02:49:56 rillig Exp $ +# $NetBSD: replace.mk,v 1.186 2007/03/05 23:35:59 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -607,8 +607,6 @@ TOOLS_CREATE+= pkg-config TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pkg-config=pkg-config TOOLS_PATH.pkg-config= ${TOOLS_PREFIX.pkg-config}/bin/pkg-config . endif -.else -TOOLS_FAIL+= pkg-config .endif .if !defined(TOOLS_IGNORE.pod2man) && !empty(_USE_TOOLS:Mpod2man) |