diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-07-13 16:10:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-13 16:10:02 +0200 |
| commit | edcab6366f6b728d2c9a57a9716cfd004812f35f (patch) | |
| tree | 300ded9553b1db0311c31c387df2498c898180e8 | |
| parent | a8410693dccf206ca58089c72449cc78d03dd612 (diff) | |
| download | mariadb-git-edcab6366f6b728d2c9a57a9716cfd004812f35f.tar.gz | |
simplify myskel.m4 and make it work when a path contains '@'
| -rw-r--r-- | sql/myskel.m4 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/myskel.m4 b/sql/myskel.m4 index b26fe46d342..8239b983f04 100644 --- a/sql/myskel.m4 +++ b/sql/myskel.m4 @@ -2,15 +2,10 @@ # fix the #line directives in the generated .cc files # to refer to the original sql_yacc.yy # -m4_define([yyfile],m4_bpatsubst(__file__,[[a-z.0-9]+$],sql_yacc.yy)) - m4_define([b4_syncline], -[m4_if(m4_index([$2],[.yy]),[-1], -[b4_sync_start([$1], [$2])[]dnl - -],[b4_sync_start([$1], ["yyfile"])[]dnl +[b4_sync_start([$1], m4_bpatsubst([$2],[yy_[a-z]+\.yy],sql_yacc.yy))[]dnl -])]) +]) # try both paths for different bison versions m4_sinclude(skeletons/c-skel.m4) |