diff options
| author | jlam <jlam@pkgsrc.org> | 2002-03-19 15:54:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-03-19 15:54:17 +0000 |
| commit | 28ea07c16410e2a9f9db534a780cf01ee52f16db (patch) | |
| tree | a7aeac7f7aea541b99c07749b233de6019926851 /mk/x11.buildlink.mk | |
| parent | 339a975f8d53708ed535362fd8da019707941fce (diff) | |
| download | pkgsrc-28ea07c16410e2a9f9db534a780cf01ee52f16db.tar.gz | |
When replacing for ${BUILDLINK_X11_DIR}, just replace it directly with
${X11BASE} instead of checking for -I or -L in front of it. This is okay
because ${BUILDLINK_X11_DIR} should just never appear in any installed
files regardless of its prefix. Problem noted in private email by Mark
Davies <mark@mcs.vuw.ac.nz>.
Diffstat (limited to 'mk/x11.buildlink.mk')
| -rw-r--r-- | mk/x11.buildlink.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk index 2cb36afc553..bb48e552ec3 100644 --- a/mk/x11.buildlink.mk +++ b/mk/x11.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.buildlink.mk,v 1.15 2002/01/27 10:33:46 markd Exp $ +# $NetBSD: x11.buildlink.mk,v 1.16 2002/03/19 15:54:17 jlam Exp $ # # This Makefile fragment is included by packages that use X11. # @@ -80,8 +80,7 @@ _BUILDLINK_CONFIG_WRAPPER_POST_SED+= \ -e "s|-L${X11BASE}/|-L${BUILDLINK_X11_DIR}/|g" _REPLACE_BUILDLINK_POST_SED+= \ - -e "s|-I${BUILDLINK_X11_DIR}/|-I${X11BASE}/|g" \ - -e "s|-L${BUILDLINK_X11_DIR}/|-L${X11BASE}/|g" + -e "s|${BUILDLINK_X11_DIR}|${X11BASE}|g" REPLACE_RPATH_SED+= \ -e "s|-R[ ]*${BUILDLINK_X11_DIR}/|-R${X11BASE}/|g" |