diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-06-27 11:40:25 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-06-27 11:40:25 +0000 |
| commit | 38712c01b3ba086a7f22a9d209fea4bfcf5caa46 (patch) | |
| tree | ade2f06b958f4cd241a792a0abfed061fad18fae | |
| parent | a8c4128002cfe8166f4a8d09a563c8a9409cfc7e (diff) | |
| download | pkgsrc-38712c01b3ba086a7f22a9d209fea4bfcf5caa46.tar.gz | |
o move REPLACE_PERL code to more proper location -- to the do-patch target;
now it works when NO_CONFIGURE is set
| -rw-r--r-- | mk/bsd.pkg.mk | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2be80a3fcf7..2f894e9f0c2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.769 2001/06/27 11:24:15 zuntum Exp $ +# $NetBSD: bsd.pkg.mk,v 1.770 2001/06/27 11:40:25 zuntum Exp $ # # This file is in the public domain. # @@ -1435,16 +1435,14 @@ do-patch: uptodate-digest fi; \ fi; \ fi -.endif - -# Configure -.if !target(do-configure) -do-configure: -.if defined(REPLACE_NCURSES) && (!defined(NEED_NCURSES) || ${NEED_NCURSES} == "NO") -.for f in ${REPLACE_NCURSES} +.if defined(REPLACE_PERL) +.for f in ${REPLACE_PERL} ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; if [ -f ${f} ]; then \ - ${SED} -e "s/ncurses/curses/g" ${f} > ${f}.new; \ + ${SED} -e "s,/usr/bin/perl,${PERL5},g" \ + -e "s,/usr/local/bin/perl,${PERL5},g" \ + -e "s,/usr/pkg/bin/perl,${PERL5},g" \ + ${f} > ${f}.new; \ if [ -x ${f} ]; then \ ${CHMOD} a+x ${f}.new; \ fi; \ @@ -1452,14 +1450,16 @@ do-configure: fi .endfor .endif +.endif -.if defined(REPLACE_PERL) -.for f in ${REPLACE_PERL} +# Configure + +.if !target(do-configure) +do-configure: +.if defined(REPLACE_NCURSES) && (!defined(NEED_NCURSES) || ${NEED_NCURSES} == "NO") +.for f in ${REPLACE_NCURSES} ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; if [ -f ${f} ]; then \ - ${SED} -e "s,/usr/bin/perl,${PERL5},g" \ - -e "s,/usr/local/bin/perl,${PERL5},g" \ - -e "s,/usr/pkg/bin/perl,${PERL5},g" \ - ${f} > ${f}.new; \ + ${SED} -e "s/ncurses/curses/g" ${f} > ${f}.new; \ if [ -x ${f} ]; then \ ${CHMOD} a+x ${f}.new; \ fi; \ |