Module Name: src
Committed By: christos
Date: Tue Jul 3 21:12:10 UTC 2018
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Use the fonts from our installed directory not the system when we are a tool!
Martin found it.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/tools/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 src/external/mit/xorg/tools/mkfontscale/Makefile:1.13
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 Wed May 9 04:13:23 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue Jul 3 17:12:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/05/09 08:13:23 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/03 21:12:10 christos Exp $
.include <bsd.hostinit.mk>
@@ -81,7 +81,7 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
+ -DFONT_ENCODINGS_DIRECTORY=\"${DESTDIR}${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
