From 604fff9c41534dbbd4bb462107870265946f5be5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 26 Aug 2000 20:52:56 +0000 Subject: [PATCH] 2000-04-14 Victor V. Vengerov 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. --- ChangeLog | 9 +++++++++ automake.in | 2 +- m4/multi.m4 | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e14125c..63b206c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-04-14 Victor V. Vengerov + + 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 * subdirs.am (maintainer-clean-recursive): Always run clean rules diff --git a/automake.in b/automake.in index a737a935..99534438 100755 --- 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 ef986883..85c6bc2c 100644 --- 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" -- 2.43.5