* libtoolize.m4sh (func_fixup_Makefile): Fix missing

substitution for nonrecursive mode.  Remove otherwise-empty
continuation lines in the output file.
Report by Bob Friesenhahn.

diff --git a/ChangeLog b/ChangeLog
index 19274410e83c00a7f46ab1d20d8ccd6f1490d6ae..d0cfabc7e2b8a0ded938215536177099c771c75e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libtoolize.m4sh (func_fixup_Makefile): Fix missing
+       substitution for nonrecursive mode.  Remove otherwise-empty
+       continuation lines in the output file.
+       Report by Bob Friesenhahn.
+
 2006-10-22  Peter O'Gorman  <peter@pogma.com>
 
        * libltdl/config/ltmain.m4sh: Add -F* to flags that are passed

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 87e6959c74c90fb5824195a527e6dc07c00bf45c..6f656cbd3f37e4ceb659daf2d06939089940c24a 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -336,7 +336,8 @@ func_fixup_Makefile ()
       s,libltdl/aclocal.m4,,
       s,libltdl/config-h.in,,
       s,libltdl/Makefile.am,,
-      s,libltdl/Makefile.in,,"
+      s,libltdl/Makefile.in,,
+      /^[[      ]]*\\\\\$/d"
     case $my_filename in
       Makefile.am)
        my_fixup_non_subpackage_script=`echo "$my_fixup_non_subpackage_script" | \
@@ -349,6 +350,7 @@ func_fixup_Makefile ()
          s,libltdl_,@repl_uscore@_,
          s,libltdl/,@repl@/,
          s,: libltdl/,: @repl@/,
+         s, -Ilibltdl , -I@repl@ ,
          s,\\\$(libltdl_,\$(@repl_uscore@_,
          s,)/libltdl ,)/@repl@ ,
          s,@repl_uscore@,${repl_uscore},g