diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-27 16:50:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-27 16:50:48 +0000 |
| commit | a586842ec06788b5a088d0009c8b84dc0941f51c (patch) | |
| tree | 0d22847fa50b2959c553beb8804d84822d8f78bf /mk | |
| parent | dc7873ffcae724f334164b5cb819331834201f6b (diff) | |
| download | pkgsrc-a586842ec06788b5a088d0009c8b84dc0941f51c.tar.gz | |
Instead of wrapping the config.status script, edit it directly to prevent
--recheck from re-executing the configure script by inserting "exit 0"
judiciously. This works with configure scripts generated by autoconf>=2.13
and fixes problems with running config.status on Solaris systems where
/bin/sh isn't POSIX enough.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f678bb50c83..2381dffe944 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1412 2004/02/25 09:24:52 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1413 2004/02/27 16:50:48 jlam Exp $ # # This file is in the public domain. # @@ -2474,21 +2474,13 @@ do-config-status-override: for file in ${_pattern_}; do \ if [ -f "$$file" ]; then \ ${MV} -f $$file $$file.overridden; \ - (${ECHO} '#!${CONFIG_SHELL}'; \ - ${ECHO} '${ECHO} "$$0 $$@" >> ${WRKLOG}'; \ - ${ECHO} 'pkgsrc_override=no'; \ - ${ECHO} 'for arg'; \ - ${ECHO} 'do'; \ - ${ECHO} ' case $$arg in'; \ - ${ECHO} ' --recheck) pkgsrc_override=yes ;;'; \ - ${ECHO} ' *) ;;'; \ - ${ECHO} ' esac'; \ - ${ECHO} 'done'; \ - ${ECHO} 'case $$pkgsrc_override in'; \ - ${ECHO} 'yes) exit 0 ;;'; \ - ${ECHO} 'esac'; \ - ${ECHO} ". ${WRKSRC}/$$file.overridden"; \ - ) > $$file; \ + ${AWK} '/ *-recheck *\| *--recheck.*)/ { \ + print; \ + print " exit 0"; \ + next; \ + } \ + { print } \ + ' $$file.overridden > $$file; \ ${CHMOD} +x $$file; \ fi; \ done |