summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2001-11-25 23:18:23 +0000
committerjlam <jlam>2001-11-25 23:18:23 +0000
commit4304ac92183c1f35d7e471a1ad234748829f9cdd (patch)
treeb703224f76ca5b463b1e90aff00239af0739e047
parent4c813824cf3ec985c11a91f3c0070d2b900d00e5 (diff)
downloadpkgsrc-4304ac92183c1f35d7e471a1ad234748829f9cdd.tar.gz
Complete idea behind previous commit.
-rw-r--r--lang/perl5/buildlink.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/lang/perl5/buildlink.mk b/lang/perl5/buildlink.mk
index bb885b24afa..c8b5f3716e6 100644
--- a/lang/perl5/buildlink.mk
+++ b/lang/perl5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/11/25 23:09:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/11/25 23:18:23 jlam Exp $
#
# This Makefile fragment is included by packages that use perl.
#
@@ -24,14 +24,20 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.perl}
_CONFIG_PM= ${PERL5_ARCHLIB}/Config.pm
_BUILDLINK_CONFIG_PM= ${_CONFIG_PM:S/${BUILDLINK_PREFIX.perl}\//${BUILDLINK_DIR}\//}
+_CPPFLAGS_LIBDIRS?= ${CPPFLAGS:M-I*:S/^-I//}
_LDFLAGS_LIBDIRS?= ${LDFLAGS:M-L*:S/^-L//}
_CONFIG_PM_SED= \
-e "/^libpth=/s|${LOCALBASE}/lib|${_LDFLAGS_LIBDIRS}|g" \
-e "/^libspath=/s|${LOCALBASE}/lib|${_LDFLAGS_LIBDIRS}|g" \
+ -e "/^locincpth=/s|${LOCALBASE}/include|${_CPPFLAGS_LIBDIRS}|g" \
+ -e "/^loclibpth=/s|${LOCALBASE}/lib|${_LDFLAGS_LIBDIRS}|g" \
-e "s|-I${LOCALBASE}/include|${CPPFLAGS}|g" \
-e "s|-L${LOCALBASE}/lib|${LDFLAGS}|g"
+REPLACE_RPATH_SED+= -e "/^LD_RUN_PATH/s|${BUILDLINK_DIR}|${LOCALBASE}|g"
+REPLACE_RPATH_SED+= -e "/^LD_RUN_PATH/s|${BUILDLINK_X11_DIR}|${X11BASE}|g"
+
.if exists(${PERL5})
. if exists(${BUILDLINK_PREFIX.perl}/share/mk/bsd.perl.mk)
. include "${BUILDLINK_PREFIX.perl}/share/mk/bsd.perl.mk"