From: Christos Zoulas Date: Tue, 28 Oct 2014 18:24:41 +0000 (-0400) Subject: remove ylwrap patching X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=3a0cd0f23734bad72abb68a79cb45d935e11228e;p=am-utils-6.2.git remove ylwrap patching --- diff --git a/bootstrap b/bootstrap index a370d191..000b0167 100755 --- a/bootstrap +++ b/bootstrap @@ -57,51 +57,6 @@ else exit 2 fi -echo "AMU: Fixing ylwrap..." -patch << \EOF ---- ylwrap.orig 2014-05-08 21:18:30.000000000 -0400 -+++ ylwrap 2014-05-09 22:25:54.900240000 -0400 -@@ -153,6 +153,22 @@ - *[\\/]*) prog="`pwd`/$prog" ;; - esac - -+prefix=`echo $input | sed \ -+ -e 's,^.*/,,g' \ -+ -e 's/_gram.[yl]$/_/g' \ -+ -e 's/_lex.[yl]$/_/g' \ -+ -e 's/_parse.[yl]$/_/g' \ -+ -e 's/_tok.[yl]$/_/g'` -+ -+case "$prog" in -+*lex) -+ flags="-P${prefix}" -+ out="mv lex.$prefix.c lex.yy.c" -+ ;; -+yacc|bison) -+ flags="-p $prefix";; -+esac -+ - # FIXME: add hostname here for parallel makes that run commands on - # other machines. But that might take us over the 14-char limit. - dirname=ylwrap$$ -@@ -166,10 +182,13 @@ - cd $dirname - - case $# in -- 0) "$prog" "$input" ;; -- *) "$prog" "$@" "$input" ;; -+ 0) "$prog" $flags "$input" ;; -+ *) "$prog" $flags "$@" "$input" ;; - esac - ret=$? -+if [ -n "$out" ]; then -+ eval $out -+fi - - if test $ret -eq 0; then - for from in * -EOF - # save timestamp echo "AMU: save timestamp..." echo timestamp > stamp-h.in