From 1813b60c951d9680f0bcb16b997da26a94637d08 Mon Sep 17 00:00:00 2001 From: jmmv Date: Sat, 8 Oct 2005 10:17:44 +0000 Subject: Fix some problems in xrender.pc generation. --- x11/Xrender/builtin.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index 3354b18ece8..adf9e124290 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.13 2005/10/07 19:40:11 jmmv Exp $ +# $NetBSD: builtin.mk,v 1.14 2005/10/08 10:17:44 jmmv Exp $ BUILTIN_PKG:= Xrender @@ -111,8 +111,9 @@ USE_BUILTIN.render= yes # Check whether the implementation we selected has a xrender.pc file # or not. If the latter, generate a fake one. -. if exists(${BUILDLINK_PREFIX.Xrender}/lib/pkgconfig/xrender.pc) -BUILDLINK_FILES.Xrender+= lib/pkgconfig/fontconfig.pc +. if !empty(IS_BUILTIN.Xrender:M[Yy][Ee][Ss]) && \ + exists(${BUILDLINK_PREFIX.Xrender}/lib/pkgconfig/xrender.pc) +BUILDLINK_FILES.Xrender+= lib/pkgconfig/xrender.pc . else BUILDLINK_TARGETS+= Xrender-fake-pc @@ -122,8 +123,9 @@ Xrender-fake-pc: ${ECHO} "Description: X Render Library"; \ ${ECHO} "Version: 0.8.4"; \ ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.Xrender}/include"; \ - ${ECHO} "Libs: -L${BUILDLINK_PREFIX.Xrender}/include" \ - "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xrender} -lXrender"; \ + ${ECHO} "Libs: -L${BUILDLINK_PREFIX.Xrender}/lib" \ + "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xrender}/lib" \ + "-lXrender"; \ } >${BUILDLINK_DIR}/lib/pkgconfig/xrender.pc . endif -- cgit v1.2.3