freetype/Makefile

+ substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib
  + substitute @LIBZ@ with -lz
fontconfig/Makefile
  + substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib

should resolve pr#24747

XXX native built xf 4.4 may suffer from the same problem
This commit is contained in:
rtr 2004-03-11 16:13:30 +00:00
parent fcc8e3a5b0
commit 020fb098d7
2 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2004/03/06 03:05:39 rtr Exp $
# $NetBSD: Makefile,v 1.7 2004/03/11 16:13:30 rtr Exp $
.include <bsd.own.mk>
@ -18,6 +18,7 @@ CONFIG_SUBST= ${HOST_SH} ${FONTCONFIGDIR}/config/config-subst \
exec_prefix="${X11BINDIR}" \
libdir="${X11USRLIBDIR}" \
includedir="${X11INCDIR}" \
hardcode_libdir_flag_spec="-Wl,-rpath,${X11USRLIBDIR}" \
PACKAGE_VERSION="1.0.1"
fontconfig.pc:

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/03/06 03:05:40 rtr Exp $
# $NetBSD: Makefile,v 1.6 2004/03/11 16:13:30 rtr Exp $
.include <bsd.own.mk>
@ -24,7 +24,9 @@ CONFIG_SUBST= sed -e 's%@prefix@%${X11ROOTDIR}%' \
-e 's%@exec_prefix@%${X11BINDIR}%' \
-e 's%@libdir@%${X11USRLIBDIR}%g' \
-e 's%@includedir@%${X11INCDIR}%' \
-e 's%@ft_version@%9.0.3%'
-e 's%@ft_version@%9.0.3%' \
-e 's%@hardcode_libdir_flag_spec@%-Wl,-rpath,${X11USRLIBDIR}%' \
-e 's%@LIBZ@%-lz%' \
freetype-config:
${CONFIG_SUBST} < ${X11SRCDIR.xc}/extras/freetype2/builds/unix/freetype-config.in > ${.TARGET}