From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 16 Nov 2015 01:12:18 +0000 (+0000)
Subject: mpers: forward mpers_DEFS to mpers.sh
X-Git-Tag: v4.11~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35bd0b8b841ec0b81ee07afcffb94a5a779a8c8a;p=strace

mpers: forward mpers_DEFS to mpers.sh

mpers_DEFS has to be forwarded to mpers.sh so that config.h would be
properly included by defs.h at preprocessor stage.

* Makefile.am (mpers-m%.stamp): Add the whole $(mpers_sh_opts) set of
options to mpers.sh's CPPFLAGS.
---

diff --git a/Makefile.am b/Makefile.am
index ab312646..8070ba3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -684,7 +684,7 @@ libmpers_CPPFLAGS = $(AM_CPPFLAGS) -DIN_MPERS
 mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
 	for f in $^; do \
 		CC="$(CC)" CFLAGS="$(mpers_sh_opts)" \
-		CPP="$(CPP)" CPPFLAGS="$(mpers_CPPFLAGS) $(mpers_INCLUDES) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
+		CPP="$(CPP)" CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
 		$(srcdir)/mpers.sh -$(mpers_NAME) $$f || exit; \
 	done
 	> $@