From 3a60ec3a23b20e2304b129bb56670ac8d498ed8b Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 2 Oct 2001 15:29:37 +0000 Subject: [PATCH] * automake.in (handle_python): Use require_conf_file_with_conf_line instead of require_file_with_conf_line, so that elisp-comp and py-compile are installed in the aux-directory. (handle_emacs_lisp): Likewise. Define elisp_comp. * lib/am/lisp.am (.el.elc): Use elisp_comp. --- ChangeLog | 8 ++++++++ automake.in | 7 +++++-- lib/am/lisp.am | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b0b4607..c746fef8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-10-02 Alexandre Duret-Lutz + + * automake.in (handle_python): Use require_conf_file_with_conf_line + instead of require_file_with_conf_line, so that elisp-comp and + py-compile are installed in the aux-directory. + (handle_emacs_lisp): Likewise. Define elisp_comp. + * lib/am/lisp.am (.el.elc): Use elisp_comp. + 2001-10-01 Akim Demaille * lib/am/distdir.am (distcheck): Report the trailing files. diff --git a/automake.in b/automake.in index a9538a9d..a41bcaeb 100755 --- a/automake.in +++ b/automake.in @@ -4339,7 +4339,9 @@ sub handle_emacs_lisp &am_error ("`lisp_LISP' defined but `AM_PATH_LISPDIR' not in `$configure_ac'") if ! $seen_lispdir && &variable_defined ('lisp_LISP'); - &require_file_with_conf_line ('AM_PATH_LISPDIR', $FOREIGN, 'elisp-comp'); + &require_conf_file_with_conf_line ('AM_PATH_LISPDIR', + $FOREIGN, 'elisp-comp'); + &define_variable ('elisp_comp', $config_aux_dir . '/elisp-comp'); } # Handle Python @@ -4353,7 +4355,8 @@ sub handle_python &am_error ("`python_PYTHON' defined but `AM_PATH_PYTHON' not in `$configure_ac'") if ! $seen_pythondir && &variable_defined ('python_PYTHON'); - &require_file_with_conf_line ('AM_PATH_PYTHON', $FOREIGN, 'py-compile'); + &require_conf_file_with_conf_line ('AM_PATH_PYTHON', + $FOREIGN, 'py-compile'); &define_variable ('py_compile', $config_aux_dir . '/py-compile'); } diff --git a/lib/am/lisp.am b/lib/am/lisp.am index be68f821..3ef098db 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -27,7 +27,7 @@ lispdir = @lispdir@ .el.elc: @echo 'WARNING: Warnings can be ignored. :-)' if test $(EMACS) != no; then \ - EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<; \ + EMACS=$(EMACS) $(SHELL) $(elisp_comp) $<; \ else : ; fi ## ------------ ## -- 2.43.5