Re: [Automake-NG] [PATCH 0/4] compile: reorganize code for default includes

[Stefano Lattarini]

On 05/28/2012 11:35 AM, Stefano Lattarini wrote:
> Some namespace cleanups, and a little move of preprocessing code from
> automake and configure runtime into make runtime.
> 
> I will push by tomorrow if there are no objections.
> 
> Regards,
>   Stefano
> 
> -*-*-
> 
> Stefano Lattarini (4):
>   maintcheck: refactor checks on obsolete variable names
>   compile: rename make variable CONFIG_HEADER -> AM_CONFIG_HEADERS
>   compile: add extra -I opts from config headers at make runtime
>   compile: rename make variable DEFAULT_INCLUDES -> AM_DEFAULT_INCLUDES
> 
I've squashed the tweak below into the third patch, and pushed.

Regards,
  Stefano

-*-*-*-

diff --git a/Makefile.am b/Makefile.am
index 7b4a8a6..533faef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,16 +31,11 @@ EXTRA_DIST =
 # then use config.status to substitute the remainder where a single
 # expansion is sufficient.  We use a funny notation here to avoid
 # configure substitutions in our text.
-do_subst = ( sed $(strip \
+do_subst = sed $(strip \
   $(foreach x, data am bin doc pkgvdata script automake_ac system_ac, \
               -e 's,@$(x)dir@,$($(x)dir),g')) \
   -e "s,address@hidden@,Generated from $(<F) do not edit by hand.,g" \
-## Hack to avoid a spurious substitution in the Automake script (part 1).
-  -e 's,address@hidden@],address@hidden@!!,g' \
-  | $(SHELL) ./config.status --file=- \
-## Hack to avoid a spurious substitution in the Automake script (part 2).
-  | sed -e 's,address@hidden@!!,@''am__isrc@,g' \
-) <$< >address@hidden
+  <"$<" | $(SHELL) ./config.status --file=- >"address@hidden"

 # Generated  files shouldn't contain unexpanded '@substitutions@', and
 # should be made read-only, to prevent them from being edited by mistake