]> Savannah Git Hosting - gnulib.git/commitdiff
parse-datetime: Fix compilation error with bison 3.7.
authorBruno Haible <bruno@clisp.org>
Wed, 29 Jul 2020 16:18:18 +0000 (18:18 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 29 Jul 2020 16:18:18 +0000 (18:18 +0200)
* modules/parse-datetime (Makefile.am): Create a generated header file
parse-datetime-gen.h in the source directory. Correct #include and

ChangeLog
modules/parse-datetime

index ab35d855a9aba4b060cf50c584246f0ddc22c084..03edebc6cc7e1e870b5e34b5276f4dc88f367339 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-07-28  Bruno Haible  <bruno@clisp.org>
+
+       parse-datetime: Fix compilation error with bison 3.7.
+       * modules/parse-datetime (Makefile.am): Create a generated header file
+       parse-datetime-gen.h in the source directory. Correct #include and
+       #line statements during preprocessing.
+
 2020-07-28  Bruno Haible  <bruno@clisp.org>
 
        fopen-gnu: Create files correctly (regression from 2020-05-24).
index b4375fda4343ecf13a95d7dbc681f41f4b293d94..39aaf6c5927af30ab1f29f59f40130c98f00ef2b 100644 (file)
@@ -45,15 +45,21 @@ Makefile.am:
 parse-datetime.c: parse-datetime.y
        $(AM_V_YACC)$(PARSE_DATETIME_BISON) -d $(YFLAGS) $(AM_YFLAGS) $(srcdir)/parse-datetime.y \
        && test ':' = '$(PARSE_DATETIME_BISON)' || { \
-         sed -e 's|".*/parse-datetime.y"|"parse-datetime.y"|' < parse-datetime.tab.c > parse-datetime.c-t \
+         sed -e 's|".*/parse-datetime\.y"|"parse-datetime.y"|' \
+             -e 's|"parse-datetime\.tab\.c"|"parse-datetime.c"|' \
+             -e 's|"parse-datetime\.tab\.h"|"parse-datetime-gen.h"|' \
+             < parse-datetime.tab.c > parse-datetime.c-tmp \
+         && sed -e 's|"parse-datetime\.tab\.h"|"parse-datetime-gen.h"|' \
+                < parse-datetime.tab.h > parse-datetime-gen.h-tmp \
          && rm -f parse-datetime.tab.c parse-datetime.tab.h \
-         && mv parse-datetime.c-t $(srcdir)/parse-datetime.c; \
+         && mv parse-datetime.c-tmp $(srcdir)/parse-datetime.c \
+         && mv parse-datetime-gen.h-tmp $(srcdir)/parse-datetime-gen.h; \
        }
 lib_SOURCES += parse-datetime.y
-BUILT_SOURCES += parse-datetime.c
-MOSTLYCLEANFILES += parse-datetime.tab.c parse-datetime.tab.h parse-datetime.c-t
-MAINTAINERCLEANFILES += parse-datetime.c
-EXTRA_DIST += parse-datetime.c
+BUILT_SOURCES += parse-datetime.c parse-datetime-gen.h
+MOSTLYCLEANFILES += parse-datetime.tab.c parse-datetime.tab.h parse-datetime.c-tmp parse-datetime-gen.h-tmp
+MAINTAINERCLEANFILES += parse-datetime.c parse-datetime-gen.h
+EXTRA_DIST += parse-datetime.c parse-datetime-gen.h
 
 Include:
 "parse-datetime.h"