summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2008-10-06 13:19:11 +0000
committercube <cube@pkgsrc.org>2008-10-06 13:19:11 +0000
commit78e303b61d4dc5bb38266d83d3ee0924463e9996 (patch)
tree11d5e94feb967f09b03e4e6e7c1a6e86c8936671 /mk
parent74f785d01f6248203aa8abeeb912b6d2dbb4714c (diff)
downloadpkgsrc-78e303b61d4dc5bb38266d83d3ee0924463e9996.tar.gz
Complete previous, by entering the package version definition if the file
looked up is not a pkgconfig one, at the condition that the version script is defined.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/pkgconfig-builtin.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/buildlink3/pkgconfig-builtin.mk b/mk/buildlink3/pkgconfig-builtin.mk
index 7907847e62b..9e1089126ed 100644
--- a/mk/buildlink3/pkgconfig-builtin.mk
+++ b/mk/buildlink3/pkgconfig-builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkgconfig-builtin.mk,v 1.3 2008/10/06 13:08:16 cube Exp $
+# $NetBSD: pkgconfig-builtin.mk,v 1.4 2008/10/06 13:19:11 cube Exp $
# This file is used to factor out a common pattern in builtin.mk files backed
# up by the existence of a pkgconfig file.
@@ -30,7 +30,9 @@ MAKEVARS:= ${MAKEVARS} IS_BUILTIN.${BUILTIN_PKG}
.if !defined(BUILTIN_PKG.${BUILTIN_PKG}) && \
!empty(IS_BUILTIN.${BUILTIN_PKG}:M[yY][eE][sS]) && \
- !empty(FIND_FILES_${BUILTIN_PKG}:M*.pc)
+ (!empty(FIND_FILES_${BUILTIN_PKG}:M*.pc) || \
+ (empty(FIND_FILES_${BUILTIN_PKG}:M__nonexistent__) && \
+ defined(BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG})))
. if !defined(BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG})
BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}= ${SED} -n -e 's/Version: //p'
. endif