Module Name: src
Committed By: snj
Date: Thu Mar 12 08:01:45 UTC 2015
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
bring back rpath fixup that was lost in revision 1.11
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
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.18 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.19
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.18 Mon Feb 9 16:27:29 2015
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 12 08:01:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/02/09 16:27:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2015/03/12 08:01:45 snj Exp $
.include <bsd.own.mk>
@@ -33,6 +33,7 @@ CONFIG_SUBST= ${TOOL_SED} \
-e 's,%LIBS_CONFIG%,-lfreetype -lz -lbz2,' \
-e 's,%LIBSSTATIC_CONFIG%,-lfreetype -lz -lbz2,' \
-e 's,%build_libtool_libs%,yes,' \
+ -e 's@%hardcode_libdir_flag_spec%@-Wl,-rpath,${X11USRLIBDIR}@' \
-e 's,%FT2_EXTRA_LIBS%,,' \
-e 's,%LIBZ%,-lz,' \
-e 's,%LIBBZ2%,-lbz2,' \
