Module Name: src
Committed By: mrg
Date: Sat Jun 8 00:37:33 UTC 2013
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
revert previous; it was already done in the previous previous.
while here, make freetype-config depend upon Makefile, so it
will be rebuilt for update builds properly.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/lib/freetype/freetype/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/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.13 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.14
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.13 Fri Jun 7 19:28:25 2013
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Sat Jun 8 00:37:33 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/06/07 19:28:25 martin Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/08 00:37:33 mrg Exp $
.include <bsd.own.mk>
@@ -31,15 +31,15 @@ CONFIG_SUBST= ${TOOL_SED} \
-e 's,%includedir%,${X11INCDIR},' \
-e 's,%ft_version%,${FT_VERSION},' \
-e 's,%build_libtool_libs%,yes,' \
- -e 's,@FT2_EXTRA_LIBS@,,' \
- -e 's,@LIBZ@,-lz,' \
- -e 's,@LIBBZ2@,-lbz2,' \
+ -e 's,%FT2_EXTRA_LIBS%,,' \
+ -e 's,%LIBZ%,-lz,' \
+ -e 's,%LIBBZ2%,-lbz2,' \
-e 's,@FT2_EXTRA_LIBS@,,' \
-e 's,@LIBZ@,-lz,' \
-e 's,@LIBBZ2@,-lbz2,'
.PATH: ${X11SRCDIR.freetype}/builds/unix
-freetype-config: freetype-config.in
+freetype-config: freetype-config.in Makefile
${_MKTARGET_CREATE}
${CONFIG_SUBST} < ${.ALLSRC} > ${.TARGET}
