* 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.

diff --git a/ChangeLog b/ChangeLog
index 3b0b4607c092c88ea34214d28a02c8c949902c79..c746fef8d18acfb1b341bd0a4fdaae6a9b1edd87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-02  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * lib/am/distdir.am (distcheck): Report the trailing files.

diff --git a/automake.in b/automake.in
index a9538a9dea813b996e86733f52103ee4f9890559..a41bcaebf2df73ae038691eaec56dc6540ef7538 100755 (executable)
--- 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 be68f821a079912ebe7115ced185005c5c19dd04..3ef098db58c68d3ad19ee6d3ea0d9fd3b138359e 100644 (file)
--- 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
 
 ## ------------ ##