diff options
| author | cube <cube> | 2008-09-28 06:04:57 +0000 |
|---|---|---|
| committer | cube <cube> | 2008-09-28 06:04:57 +0000 |
| commit | 3f8c784f51f43e04222d7183d5dbf4014997271f (patch) | |
| tree | a12b5fa51392f14756d5d025b983576ea3a0e23e | |
| parent | 73fdbf4f91e9d589e89fc99f9e794045355ddda0 (diff) | |
| download | pkgsrc-3f8c784f51f43e04222d7183d5dbf4014997271f.tar.gz | |
Avoid the 'VAR.${SEL}?= value' construct which has surprising results
depending on the version of make(1).
| -rw-r--r-- | mk/buildlink3/pkgconfig-builtin.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/buildlink3/pkgconfig-builtin.mk b/mk/buildlink3/pkgconfig-builtin.mk index 4f33a0ae624..b47f78802a5 100644 --- a/mk/buildlink3/pkgconfig-builtin.mk +++ b/mk/buildlink3/pkgconfig-builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkgconfig-builtin.mk,v 1.1.2.4 2008/09/27 20:23:28 cube Exp $ +# $NetBSD: pkgconfig-builtin.mk,v 1.1.2.5 2008/09/28 06:04:57 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. @@ -14,9 +14,7 @@ BUILTIN_FIND_FILES.FIND_FILES_${BUILTIN_PKG}= ${PKGCONFIG_FILE.${BUILTIN_PKG}} .include "../../mk/buildlink3/bsd.builtin.mk" -PKGCONFIG_BASE.${BUILTIN_PKG}?= ${X11BASE} - -.if ${PKGCONFIG_BASE.${BUILTIN_PKG}} == ${LOCALBASE} +.if ${PKGCONFIG_BASE.${BUILTIN_PKG}:U${X11BASE}} == ${LOCALBASE} IS_BUILTIN.${BUILTIN_PKG}= no .elif !defined(IS_BUILTIN.${BUILTIN_PKG}) IS_BUILTIN.${BUILTIN_PKG}= no |