Reworked to avoid depending on $(eval) in the make files as only fairly
new GNU make versions seem to have it.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5037 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.flags.am b/Makefile.flags.am
index 37c2989..e922815 100644
--- a/Makefile.flags.am
+++ b/Makefile.flags.am
@@ -14,8 +14,6 @@
AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE)
AM_CCASFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) -Wa,-maltivec -g
-PLATFORM = $(shell echo @VG_PLATFORM@ | tr '[a-z-]' '[A-Z_]')
-
-$(eval AM_CPPFLAGS = $(value AM_CPPFLAGS_$(PLATFORM)))
-$(eval AM_CFLAGS = $(value AM_CFLAGS_$(PLATFORM)))
-$(eval AM_CCASFLAGS = $(value AM_CCASFLAGS_$(PLATFORM)))
+AM_CPPFLAGS = $(AM_CPPFLAGS_@VG_MAKE_PLATFORM@)
+AM_CFLAGS = $(AM_CFLAGS_@VG_MAKE_PLATFORM@)
+AM_CCASFLAGS = $(AM_CCASFLAGS_@VG_MAKE_PLATFORM@)
diff --git a/configure.in b/configure.in
index d275191..62a8ccd 100644
--- a/configure.in
+++ b/configure.in
@@ -224,6 +224,9 @@
AM_CONDITIONAL(VG_AMD64_LINUX, test x$VG_PLATFORM = xamd64-linux)
AM_CONDITIONAL(VG_PPC32_LINUX, test x$VG_PLATFORM = xppc32-linux)
+AC_SUBST(VG_MAKE_PLATFORM)
+VG_MAKE_PLATFORM=`echo $VG_PLATFORM | tr [a-z-] [A-Z_]`
+
AC_SUBST(DEFAULT_SUPP)
glibc=""