--- a/open-src/common/Makefile.inc Mon Aug 27 12:41:55 2007 -0700
+++ b/open-src/common/Makefile.inc Mon Aug 27 12:45:38 2007 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.77 07/07/25
+# @(#)Makefile.inc 1.78 07/08/27
#
# Borrowed from Solaris OS/Net makefile.master:
@@ -225,6 +225,7 @@
FIX_PC_OPS= \
-e 's|-L\$${libdir}|-L\$${libdir} -R\$${libdir}|;' \
+ -e 's|(Requires: .*)\bx11\b|$$1|;' \
-e 's|Requires.private: .*$$||;'
# -e 's|^prefix=@prefix@|prefix=\$$\{top_builddir\}@prefix@|'
--- a/open-src/lib/libXft/Makefile Mon Aug 27 12:41:55 2007 -0700
+++ b/open-src/lib/libXft/Makefile Mon Aug 27 12:45:38 2007 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 07/08/17
+# @(#)Makefile 1.10 07/08/28
#
PWD:sh=pwd
@@ -72,7 +72,7 @@
# Mapfile used to control which symbols are exported
XFT_MAPFILE=$(PWD)/mapfile.scope
-LIB_ADD_LD_OPTIONS=-M$(XFT_MAPFILE)
+LIB_ADD_LD_OPTIONS=-M$(XFT_MAPFILE) -lX11
# pkg-config files that need to have -R added
FIX_PC_FILES=xft.pc.in