--- a/open-src/font/Makefile.inc Wed Dec 04 11:06:37 2013 -0800
+++ b/open-src/font/Makefile.inc Fri Dec 13 15:36:33 2013 -0800
@@ -87,9 +87,11 @@
# sun-aliases module or during packaging in generate_font_metadata.pl).
MODTYPE_CONFIG_OPTS += MKFONTDIR=/usr/bin/true
-# Most font modules have nothing to build, for those that do, use lib flags
-MODTYPE_CFLAGS=$(LIB_CFLAGS)
-MODTYPE_LDFLAGS=$(LIB_LDFLAGS)
+# Most font modules have nothing to build, but font-util builds some programs
+MODTYPE_CFLAGS=$(PROG_CFLAGS)
+MODTYPE_CPPFLAGS=$(PROG_CPPFLAGS)
+MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS)
+MODTYPE_LDFLAGS=$(PROG_LDFLAGS)
MODTYPE_LD_OPTIONS=
# Paths to find mkfontscale, fc-cache & the libraries they need in build area