Use -P preprocessor option to avoid to inhibit generation of linemarkers in the

output from the preprocessor

This ensures that grepping for the elog messages works correctly on various
compilers (tested for gcc and clang)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 78a915bb2282bcc4ee945a6a5fac3cd011560407..f6ab57ef1c82f85e94a1c09271944bc9db5f24fe 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -50,6 +50,8 @@ clean:
        rm -rf tmp_install/
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
+# Remove MSGIDS file too
+       rm -f MSGIDS
 
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c6bade1db37143db8a64ddce1f2445d11b89b22c..0c4490029d37291d11a0aaea00fafac9e8488ac3 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -863,7 +863,7 @@ endif # enable_coverage
 genmsgids = @genmsgids@
 
 ifeq ($(genmsgids), yes)
-PREPROCESS.c = $(CC) $(CFLAGS) $(CPPFLAGS) -E
+PREPROCESS.c = $(CC) $(CFLAGS) $(CPPFLAGS) -E -P
 
 PGXL_MSG_FILEID := 1
 PGXL_MSG_MODULE := $(shell cat $(top_builddir)/MSGMODULES | grep -E "^subdir = $(subdir):" | cut -d ':' -f 2)