Module Name: src
Committed By: tron
Date: Sun Mar 23 19:49:52 UTC 2014
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
"current-users" mailing list.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.109 src/share/mk/bsd.x11.mk:1.110
--- src/share/mk/bsd.x11.mk:1.109 Thu Mar 20 22:24:32 2014
+++ src/share/mk/bsd.x11.mk Sun Mar 23 19:49:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.109 2014/03/20 22:24:32 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.110 2014/03/23 19:49:52 tron Exp $
.include <bsd.init.mk>
@@ -344,10 +344,10 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@abi_font@,0.6,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
- -e "s,@PKG_CONFIG_LIBS@,xx,; \
+ -e "s,@PKG_CONFIG_LIBS@,${PKG_CONFIG_LIBS},; \
s,@PACKAGE@,${PKGDIST},; \
- s,@PKGCONFIG_REQUIRES@,xx,; \
- s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+ s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+ s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
s,@ERRORDBDIR@,${X11LIBDIR},; \
s,@EXPAT_CFLAGS@,,; \
s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
