[PATCH v2 09/11] build: eliminate `ltmain.in' intermediate file.

[Gary V. Vaughan]

Factored out of the origin 3/4 patch.

Okay to push?

* Makefile.am (libltdl/config/ltmain.sh): Pipe the output of
`$(LT_M4SH)' directly into `$(bootstrap_edit)' to avoid use
of superfluous intermediate file.

Signed-off-by: Gary V. Vaughan <address@hidden>
---
 ChangeLog   |    5 +++++
 Makefile.am |   12 ++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d923588..ba2c3a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-31  Gary V. Vaughan  <address@hidden>
 
+       build: eliminate `ltmain.in' intermediate file.
+       * Makefile.am (libltdl/config/ltmain.sh): Pipe the output of
+       `$(LT_M4SH)' directly into `$(bootstrap_edit)' to avoid use
+       of superfluous intermediate file.
+
        build: don't hardcode repeated long paths in Makefile rules.
        * Makefile.am (libltdl/m4/ltversion.m4, libltdl/config/ltmain.sh):
        Use sed to calculate input file names from "$@".
diff --git a/Makefile.am b/Makefile.am
index 90cd671..16e1a69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,7 @@ $(srcdir)/$(m4dir)/ltversion.m4: $(m4dir)/ltversion.in 
configure.ac ChangeLog
 ## would rerun configure on every invocation, so now we manually
 ## check the version numbers from the build rule when necessary.
 ## !WARNING! If you edit this rule to change the contents of ltmain.sh,
-##           you must `touch $(srcdir)/$(auxdir)/ltmain.in' from the
+##           you must `touch $(srcdir)/$(auxdir)/ltmain.m4sh' from the
 ##           shell if you need ltmain.sh to be regenerated.  Ideally, we
 ##           should make this rule depend on Makefile but that will break
 ##           distcheck (at least) by rebuilding ltmain.sh in the source
@@ -148,13 +148,9 @@ $(srcdir)/$(auxdir)/ltmain.sh: $(sh_files) 
$(auxdir)/ltmain.m4sh configure.ac Ch
        done; \
        if $$rebuild; then \
          in=`echo "$@" | sed 's:\.sh$$:.m4sh:'`; \
-         intermediate=`echo "$@" | sed 's:\.sh$$:.in'`; \
-         rm -f "$$intermediate" "address@hidden" "$@"; \
-         echo "$(LT_M4SH) $$in > $$intermediate"; \
-         $(LT_M4SH) "$$in" > "$$intermediate"; \
-         echo "$(bootstrap_edit) $$intermediate > $@"; \
-         $(bootstrap_edit) "$$intermediate" > "address@hidden"; \
-         rm -f "$$intermediate"; \
+         rm -f "address@hidden" "$@"; \
+         echo "$(LT_M4SH) $$in | $(bootstrap_edit) > $@"; \
+         $(LT_M4SH) "$$in" | $(bootstrap_edit) > "address@hidden"; \
          chmod a-w "address@hidden"; \
          mv -f "address@hidden" "$@"; \
        fi
-- 
1.7.3