diff --git a/examples/extexi b/examples/extexi index d50b477b..3b7d907d 100755 --- a/examples/extexi +++ b/examples/extexi @@ -60,7 +60,11 @@ sub normalize($) { local ($_) = @_; - s/^\@(c |comment|dots|end (ignore|group)|ignore|group).*\n//mg; + # If we just remove this lines, then the compiler's tracking of + # #lines is broken. Leave lines that that accepted by all our tools + # (including flex, hence the leading space), and that will be easy + # to remove (see the Make examples-unline recipe). + s{^\@(c |comment|dots|end (ignore|group)|ignore|group).*}{ /**/}mg; s/\@value\{VERSION\}/$ENV{VERSION}/g; s/^\@(error|result)\{\}//mg; s/\@([{}@])/$1/g; diff --git a/examples/local.mk b/examples/local.mk index a35c082f..1cd60457 100644 --- a/examples/local.mk +++ b/examples/local.mk @@ -59,12 +59,8 @@ EXTRA_DIST += %D%/extracted.stamp dist-hook: examples-unline .PHONY: examples-unline examples-unline: - for e in $(extracted); \ - do \ - e=$(distdir)/$$e; \ - sed -e '/#line/d' $$e >$$e.tmp; \ - mv -f $$e.tmp $$e; \ - done + cd $(distdir) && \ + perl -pi -0777 -e 's/#line.*\n//g;s{^ /\*\*/\n}{}mg' $(extracted) ## ---------- ##