diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2003-10-02 10:25:28 +0400 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2003-10-02 10:25:28 +0400 |
| commit | 3a3f30763c4a4f467d77e168b91065997942fc5f (patch) | |
| tree | ff4b62e9965f66c809d1ef6c9ee1dab4bba68144 /config-ml.in | |
| parent | 89238062995e04a31600ccad4d5605064c63998e (diff) | |
2003-10-01 Phil Edwards <pme@gcc.gnu.org>
* config-ml.in: Use ac_configure_args directly instead of
ml_arguments. Only set ml_norecursion if --no[-]recursion is
actually seen.
2003-10-01 Eric Botcazou <ebotcazou@libertysurf.fr>
* config-ml.in: Propagate INSTALL variables.
Diffstat (limited to 'config-ml.in')
| -rw-r--r-- | config-ml.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config-ml.in b/config-ml.in index 865275ce3..06752b7a6 100644 --- a/config-ml.in +++ b/config-ml.in @@ -101,13 +101,12 @@ Makefile=${ac_file-Makefile} ml_config_shell=${CONFIG_SHELL-/bin/sh} -ml_arguments="${ac_configure_args}" ml_realsrcdir=${srcdir} # Scan all the arguments and set all the ones we need. ml_verbose=--verbose -for option in ${ml_arguments} +for option in ${ac_configure_args} do case $option in --*) ;; @@ -133,7 +132,7 @@ do enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` eval $enableopt="$optarg" ;; - --norecursion | --no*) + --norecursion | --no-recursion) ml_norecursion=yes ;; --silent | --sil* | --quiet | --q*) @@ -555,6 +554,10 @@ multi-do: LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \ LDFLAGS="$(LDFLAGS) $${flags}" \ DESTDIR="$(DESTDIR)" \ + INSTALL="$(INSTALL)" \ + INSTALL_DATA="$(INSTALL_DATA)" \ + INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \ + INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \ $(DO)); then \ true; \ else \ @@ -856,7 +859,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \ --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \ - ${ml_arguments} ${ml_srcdiroption} ; then + ${ac_configure_args} ${ml_srcdiroption} ; then true else exit 1 |