2000-04-14 Victor V. Vengerov <vvv@oktet.ru>

	Fix for PR automake/67.
	* automake.in (handle_multilib): remove .am suffix in fragment
	name passed to file_contents.
	* m4/multi.m4: Add missing ')' in AC_ARG_ENABLE invocation.
	Remove external quotes in first arg of AC_OUTPUT_COMMANDS.
	Remove unnecessary "rel-to-top-srcdir" before config-ml.in.

diff --git a/ChangeLog b/ChangeLog
index 9e14125c06c4b8edc9ba416699fbbe17b073169b..63b206c56099a720ef5939c215337999ca558653 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-14  Victor V. Vengerov <vvv@oktet.ru>
+
+       Fix for PR automake/67.
+       * automake.in (handle_multilib): remove .am suffix in fragment
+       name passed to file_contents.
+       * m4/multi.m4: Add missing ')' in AC_ARG_ENABLE invocation.
+       Remove external quotes in first arg of AC_OUTPUT_COMMANDS.
+       Remove unnecessary "rel-to-top-srcdir" before config-ml.in.
+
 2000-08-26  Tom Tromey  <tromey@cygnus.com>
 
        * subdirs.am (maintainer-clean-recursive): Always run clean rules

diff --git a/automake.in b/automake.in
index a737a93518dc94f5d2b96527f69ceca5d87729bd..99534438c9558bf50674eda6facc22a2cd68c654 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2580,7 +2580,7 @@ sub handle_multilib
 {
     return unless $seen_multilib;
 
-    $output_rules .= &file_contents ('multilib.am');
+    $output_rules .= &file_contents ('multilib');
     &push_phony_cleaners ('multi');
     push (@phony, 'all-multi', 'install-multi');
 }

diff --git a/m4/multi.m4 b/m4/multi.m4
index ef986883bd5174ad5ee89cb893359a9914e56da5..85c6bc2c46282fe6335b2dde65a0b8e411a2ef7e 100644 (file)
--- a/m4/multi.m4
+++ b/m4/multi.m4
@@ -9,7 +9,7 @@ AC_ARG_ENABLE(multilib,
   yes) multilib=yes ;;
   no)  multilib=no ;;
   *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes]
+ esac], [multilib=yes])
 
 # We may get other options which we are undocumented:
 # --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -25,10 +25,10 @@ else
 fi
 AC_SUBST(multi_basedir)
 
-AC_OUTPUT_COMMANDS([
+AC_OUTPUT_COMMANDS(
 if test -n "$CONFIG_FILES"; then
-   ac_file=ifelse([$1],,Makefile,[$1]) . ..ifelse([$2],,,/[$2])/config-ml.in
-fi], [
+   ac_file=[]ifelse([$1],,Makefile,[$1]) . ${multi_basedir}/config-ml.in
+fi, [
 srcdir="$srcdir"
 host="$host"
 target="$target"