pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/Xrender Fix some problems in xrender.pc generation.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/681b2cd65eb4
branches:  trunk
changeset: 500438:681b2cd65eb4
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Oct 08 10:17:44 2005 +0000

description:
Fix some problems in xrender.pc generation.

diffstat:

 x11/Xrender/builtin.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 8c93fda0fd9a -r 681b2cd65eb4 x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk    Sat Oct 08 10:07:30 2005 +0000
+++ b/x11/Xrender/builtin.mk    Sat Oct 08 10:17:44 2005 +0000
@@ -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 @@
 
 # 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 @@
           ${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
 



Home | Main Index | Thread Index | Old Index