summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorseb <seb>2003-10-07 09:09:56 +0000
committerseb <seb>2003-10-07 09:09:56 +0000
commit98bc34ecdd9f32db6dd1e384a70f694d952825a4 (patch)
treec0749d855ef153245cb6dbef2f1d8795bd462c88 /mk
parent4ea42cf04c20bcf8ece67fbffd4ee8e6c0361235 (diff)
downloadpkgsrc-98bc34ecdd9f32db6dd1e384a70f694d952825a4.tar.gz
Insure that the install-info we found is not one provided by the gtexinfo
package by comparing its "base path" against LOCALBASE. This should fix the problem mentioned in PR pkg/20450.
Diffstat (limited to 'mk')
-rw-r--r--mk/texinfo.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index dfe83e92b35..178106b6612 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.23 2003/09/09 09:10:55 seb Exp $
+# $NetBSD: texinfo.mk,v 1.24 2003/10/07 09:09:56 seb Exp $
#
# This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
# not empty or USE_MAKEINFO is not "no".
@@ -24,7 +24,7 @@ INFO_DIR?= info
# Any version will fit (really?).
_INSTALL_INFO=
. for _i_ in /usr/bin/install-info /sbin/install-info
-. if exists(${_i_})
+. if exists(${_i_}) && (${LOCALBASE} != ${_i_:C|/[^/]+/install-info$||})
_INSTALL_INFO= ${_i_}
. endif
. endfor