We need PERL5_INSTALLARCHLIB, so compute its value appropriately.

3 files changed, 18 insertions, 16 deletions

diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk
index dea8712be75..16502938eeb 100644
--- a/lang/perl5/buildlink2.mk
+++ b/lang/perl5/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/11/25 19:30:21 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/01/12 15:50:22 jlam Exp $
 
 .if !defined(PERL5_BUILDLINK2_MK)
 PERL5_BUILDLINK2_MK=  # defined
@@ -49,6 +49,11 @@ PERL5_SUB_${_var_}!=	\
 	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
 MAKEFLAGS+=	PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}"
 .    endfor
+PERL5_SUB_INSTALLARCHLIB!=	\
+	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
+	${ECHO} $$installarchlib |					\
+	${SED} -e "s,^${_PERL5_PREFIX}/,,"
+MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}"
 PERL5_SUB_INSTALLSCRIPT!=	\
 	eval `${PERL5} -V:installscript 2>/dev/null`;			\
 	${ECHO} $$installscript |					\
@@ -58,8 +63,8 @@ MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
 .endif
 
 BUILDLINK_FILES.perl=							\
-	${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/CORE/*		\
-	${PERL5_ARCHLIB:S/^${BUILDLINK_PREFIX.perl}\///}/auto/DynaLoader/DynaLoader.a
+	${PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
+	${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
 
 BUILDLINK_TARGETS+=	perl-buildlink
 
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index bcb4fc77c58..2f790e6b302 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/11 19:41:39 cjep Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/12 15:50:22 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -53,6 +53,11 @@ PERL5_SUB_${_var_}!=	\
 	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
 MAKEFLAGS+=	PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}"
 .    endfor
+PERL5_SUB_INSTALLARCHLIB!=	\
+	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
+	${ECHO} $$installarchlib |					\
+	${SED} -e "s,^${_PERL5_PREFIX}/,,"
+MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}"
 PERL5_SUB_INSTALLSCRIPT!=	\
 	eval `${PERL5} -V:installscript 2>/dev/null`;			\
 	${ECHO} $$installscript |					\
@@ -67,17 +72,9 @@ MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
 # default BUILDLINK_FILES_CMD, so name them to be symlinked into
 # ${BUILDLINK_DIR}.
 #
-.    if !defined(_PERL5_INSTALLARCHLIB)
-_PERL5_INSTALLARCHLIB!=							\
-	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
-	${ECHO} $$installarchlib
-MAKEFLAGS+=	_PERL5_INSTALLARCHLIB="${_PERL5_INSTALLARCHLIB}"
-.    endif
-_PERL5_SUB_INSTALLARCHLIB=						\
-	${_PERL5_INSTALLARCHLIB:S,^${BUILDLINK_PREFIX.perl}/,,}
 BUILDLINK_FILES.perl=							\
-	${_PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
-	${_PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
+	${PERL5_SUB_INSTALLARCHLIB}/CORE/*				\
+	${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
 .  endif
 .endif  # PERL5_BUILDLINK3_MK
 
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk
index 682d8cf4249..57a3a749c7a 100644
--- a/lang/perl5/module.mk
+++ b/lang/perl5/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.28 2004/01/08 18:03:04 jlam Exp $
+# $NetBSD: module.mk,v 1.29 2004/01/12 15:50:22 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -80,7 +80,7 @@ do-configure: perl5-configure
 # Repoint all of the site-specific variables to be under the perl5
 # module's ${PREFIX}.
 #
-.for _var_ in ${_PERL5_SITEVARS} INSTALLSCRIPT
+.for _var_ in ${_PERL5_SITEVARS} INSTALLARCHLIB INSTALLSCRIPT
 PERL5_${_var_}=	${PREFIX}/${PERL5_SUB_${_var_}}
 MAKE_FLAGS+=	${_var_}="${PERL5_${_var_}}"
 .endfor