From: Bruno Haible Date: Wed, 29 Jul 2020 16:18:18 +0000 (+0200) Subject: parse-datetime: Fix compilation error with bison 3.7. X-Git-Tag: v1.0~3845 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b4953c24746af418aa005c4f64c80623af1c68ad;p=gnulib.git 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 --- diff --git a/ChangeLog b/ChangeLog index ab35d855a9..03edebc6cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-07-28 Bruno Haible + + 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 fopen-gnu: Create files correctly (regression from 2020-05-24). diff --git a/modules/parse-datetime b/modules/parse-datetime index b4375fda43..39aaf6c592 100644 --- a/modules/parse-datetime +++ b/modules/parse-datetime @@ -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"