diff options
| author | Michael Forney <mforney@mforney.org> | 2017-02-02 18:45:13 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-02-07 14:36:26 -0800 |
| commit | a4b4e6bb962757a10e454ee014c5cb40d4eaccb3 (patch) | |
| tree | b3108d8f6dbe55878225973fa62cba4589fb3cfa | |
| parent | b47f3fc7cbc0b38087c19f5fe8bd3d34f0570458 (diff) | |
Use $OLDPWD
| -rw-r--r-- | pkg/ncurses/gen.rc | 2 | ||||
| -rw-r--r-- | pkg/python/gen.rc | 2 | ||||
| -rw-r--r-- | rules.ninja | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/ncurses/gen.rc b/pkg/ncurses/gen.rc index 336d7cdd..6ca8c645 100644 --- a/pkg/ncurses/gen.rc +++ b/pkg/ncurses/gen.rc @@ -53,7 +53,7 @@ build '$outdir'/include/term.h mkterm '$srcdir'/include/Caps '|' '$outdir'/MKter build '$outdir'/codes.c awk '$srcdir'/include/Caps '|' '$srcdir'/ncurses/tinfo/MKcodes.awk ; with\ expr '-f $srcdir/ncurses/tinfo/MKcodes.awk bigstrings=1' -rule mkcaptab '(wd=$$PWD && cd $outdir && $$wd/$srcdir/ncurses/tinfo/MKcaptab.sh awk 1 $$wd/$srcdir/ncurses/tinfo/MKcaptab.awk $$wd/$in) >$out.tmp && mv $out.tmp $out' +rule mkcaptab '(cd $outdir && $$OLDPWD/$srcdir/ncurses/tinfo/MKcaptab.sh awk 1 $$OLDPWD/$srcdir/ncurses/tinfo/MKcaptab.awk $$OLDPWD/$in) >$out.tmp && mv $out.tmp $out' build '$outdir'/comp_captab.c mkcaptab '$srcdir'/include/Caps '|' '$outdir'/make_hash '$srcdir'/tinfo/^(MKcaptab.awk MKcaptab.sh) rule mkfallback 'sh $srcdir/ncurses/tinfo/MKfallback.sh /dev/null /dev/null /dev/null >$out.tmp && mv $out.tmp $out' diff --git a/pkg/python/gen.rc b/pkg/python/gen.rc index 1052891a..981365c1 100644 --- a/pkg/python/gen.rc +++ b/pkg/python/gen.rc @@ -148,7 +148,7 @@ if(grep -q '^zlib' Setup) { libs=($libs zlib/libz.a) } -rule makesetup 'wd=$$PWD && cd $outdir && $$wd/$srcdir/Modules/makesetup -s $$wd/$srcdir -m - $$wd/$in' +rule makesetup 'cd $outdir && $$OLDPWD/$srcdir/Modules/makesetup -s $$OLDPWD/$srcdir -m - $$OLDPWD/$in' build '$outdir'/config.c makesetup '$dir'/Setup '|' '$srcdir'/Modules/^(makesetup config.c.in) cflags $cflags diff --git a/rules.ninja b/rules.ninja index 389ad9ac..c71f79b8 100644 --- a/rules.ninja +++ b/rules.ninja @@ -59,7 +59,7 @@ rule gzip command = gzip -c -9 -n <$in >$out.tmp && mv $out.tmp $out rule yacc - command = oldcwd=$$PWD && cd $outdir && $yacc $yaccflags $$oldcwd/$in + command = cd $outdir && $yacc $yaccflags $$OLDPWD/$in rule sed command = sed $expr $in >$out.tmp && mv $out.tmp $out |