pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/perl5 Need to override the directory that scripts...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6053b2f96611
branches:  trunk
changeset: 461276:6053b2f96611
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 14:13:14 2003 +0000

description:
Need to override the directory that scripts are installed into.  For some
reason, there isn't a sitescript variable.

diffstat:

 lang/perl5/module.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 567db44eaf81 -r 6053b2f96611 lang/perl5/module.mk
--- a/lang/perl5/module.mk      Sat Sep 13 13:53:31 2003 +0000
+++ b/lang/perl5/module.mk      Sat Sep 13 14:13:14 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.16 2003/09/13 13:53:31 jlam Exp $
+# $NetBSD: module.mk,v 1.17 2003/09/13 14:13:14 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -74,8 +74,11 @@
 
 .if !defined(_PERL5_SITEPREFIX)
 .  if exists(${PERL5})
+_PERL5_PREFIX!=        \
+       eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=    \
-       eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $${siteprefix}
+       eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix
+MAKEFLAGS+=    _PERL5_PREFIX="${_PERL5_PREFIX}"
 MAKEFLAGS+=    _PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}"
 #
 # Repoint all of the site-specific variables to be under the perl5
@@ -96,10 +99,15 @@
        ${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
 MAKEFLAGS+=    _PERL5_SUB_${_var_}="${_PERL5_SUB_${_var_}}"
 .    endfor
+_PERL5_SUB_INSTALLSCRIPT!=     \
+       eval `${PERL5} -V:installscript 2>/dev/null`;                   \
+       ${ECHO} $$installscript |                                       \
+       ${SED} -e "s,^${_PERL5_PREFIX}/,,"
+MAKEFLAGS+=    _PERL5_SUB_INSTALLSCRIPT="${_PERL5_SUB_INSTALLSCRIPT}"
 .  endif
 .endif
 
-.for _var_ in ${_PERL5_SITEVARS}
+.for _var_ in ${_PERL5_SITEVARS} INSTALLSCRIPT
 _PERL5_${_var_}=       ${PREFIX}/${_PERL5_SUB_${_var_}}
 MAKE_FLAGS+=           ${_var_}="${_PERL5_${_var_}}"
 .endfor



Home | Main Index | Thread Index | Old Index