summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-10-09 21:43:02 +0000
committerjmmv <jmmv@pkgsrc.org>2005-10-09 21:43:02 +0000
commitb4df058f0ed8398f9ef9f3fa191e26e44305b196 (patch)
tree0c4aee1164de59694147cb6380369bf8bd225467 /x11
parentc5d059b1be73a8d1fd1911f28c7427c1d47a8e1f (diff)
downloadpkgsrc-b4df058f0ed8398f9ef9f3fa191e26e44305b196.tar.gz
BUILDLINK_PREFIX.xextensions is not available in builtin.mk, so the check
for it never works if using make constructions. Change it to use shell code, as done in Xrender. (Also for consistency in both packages.)
Diffstat (limited to 'x11')
-rw-r--r--x11/xextensions/builtin.mk29
1 files changed, 17 insertions, 12 deletions
diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk
index e15e2311795..a98317d134a 100644
--- a/x11/xextensions/builtin.mk
+++ b/x11/xextensions/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/10/08 10:07:30 jmmv Exp $
+# $NetBSD: builtin.mk,v 1.8 2005/10/09 21:43:02 jmmv Exp $
BUILTIN_PKG:= xextensions
@@ -65,20 +65,25 @@ BUILDLINK_PREFIX.xextensions= ${X11BASE}
. include "../../mk/x11.builtin.mk"
. endif
-# Check whether the implementation we selected has a xextensions.pc file
-# or not. If the latter, generate a fake one.
-. if exists(${BUILDLINK_PREFIX.xextensions}/lib/pkgconfig/xextensions.pc)
-BUILDLINK_FILES.xextensions+= lib/pkgconfig/xextensions.pc
-. else
+# If we are using the builtin version, check whether it has a xextensions.pc
+# file or not. If the latter, generate a fake one.
+. if !empty(USE_BUILTIN.xextensions:M[Yy][Ee][Ss])
BUILDLINK_TARGETS+= xextensions-fake-pc
xextensions-fake-pc:
- @${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
- @{ ${ECHO} "Name: XExtensions"; \
- ${ECHO} "Description: Sundry X extension headers"; \
- ${ECHO} "Version: 1.0.1"; \
- ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.xextensions}/include"; \
- } >${BUILDLINK_DIR}/lib/pkgconfig/xextensions.pc
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ src=${BUILDLINK_PREFIX.xextensions}/lib/pkgconfig/xextensions.pc \
+ dst=${BUILDLINK_DIR}/lib/pkgconfig/xextensions.pc; \
+ ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
+ if ${TEST} -f $${src}; then \
+ ${LN} -sf $${src} $${dst}; \
+ else \
+ { ${ECHO} "Name: XExtensions"; \
+ ${ECHO} "Description: Sundry X extension headers"; \
+ ${ECHO} "Version: 1.0.1"; \
+ ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.xextensions}/include"; \
+ } >$${dst}; \
+ fi
. endif
.endif # CHECK_BUILTIN.xextensions