From cdf3665cb083939a40bc37beb0b46a2dcc03e5e7 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 24 Oct 2006 20:07:35 +0000 Subject: [PATCH] * libtoolize.m4sh (func_fixup_Makefile): Fix missing substitution for nonrecursive mode. Remove otherwise-empty continuation lines in the output file. Report by Bob Friesenhahn. --- ChangeLog | 7 +++++++ libtoolize.m4sh | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19274410e..d0cfabc7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-24 Ralf Wildenhues + + * 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 * libltdl/config/ltmain.m4sh: Add -F* to flags that are passed diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 87e6959c7..6f656cbd3 100644 --- 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 -- 2.47.3