diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-11-13 19:39:06 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-11-13 19:39:06 +0000 |
| commit | 6b86476fc7363ec1092b3db3a6f39b5d903a37f2 (patch) | |
| tree | 8039cecf906c5a7921db79622778a2c6f07c23ff | |
| parent | 52e9880a48ccc95a222c4dc9b6ff538aa26725a9 (diff) | |
| download | automake-6b86476fc7363ec1092b3db3a6f39b5d903a37f2.tar.gz | |
* m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
running AC_CHECK_PROGS(EMACS).
* lib/am/lisp.am (elc-stamp): Quote $(EMACS).
Report from Jens Petersen.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | lib/am/lisp.am | 4 | ||||
| -rw-r--r-- | m4/lispdir.m4 | 8 |
4 files changed, 12 insertions, 6 deletions
@@ -1,5 +1,10 @@ 2003-11-13 Alexandre Duret-Lutz <adl@gnu.org> + * m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before + running AC_CHECK_PROGS(EMACS). + * lib/am/lisp.am (elc-stamp): Quote $(EMACS). + Report from Jens Petersen. + * tests/mkinst2.test: Rewrite. * m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND. @@ -95,6 +95,7 @@ Jeff Garzik jgarzik@pobox.com Jeff Squyres jsquyres@lam-mpi.org Jens Elkner elkner@imsgroup.de Jens Krüger jens_krueger@physik.tu-muenchen.de +Jens Petersen petersen@redhat.com Jeremy Nimmer jwnimmer@alum.mit.edu Jerome Lovy jlovy@multimania.com Jerome Santini santini@chambord.univ-orleans.fr diff --git a/lib/am/lisp.am b/lib/am/lisp.am index ed6ad40dc..2e754f4c3 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -24,7 +24,7 @@ elc-stamp: $(am__ELFILES) @echo 'WARNING: Warnings can be ignored. :-)' - if test $(EMACS) != no; then \ + if test "$(EMACS)" != no; then \ ## Make sure "$@" isn't empty initially. set x; \ ## Populate "$@" with elisp files (found in the current directory @@ -35,7 +35,7 @@ elc-stamp: $(am__ELFILES) done; \ ## Finally call elisp-comp for all files. shift; \ - EMACS=$(EMACS) $(SHELL) $(elisp_comp) "$$@" || exit 1; \ + EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \ else : ; fi touch $@ diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 74aac3cb9..062b49e6e 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -27,7 +27,10 @@ # AM_PATH_LISPDIR # --------------- AC_DEFUN([AM_PATH_LISPDIR], -[AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) +[ # If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. + test x"$EMACS" = xt && EMACS= + AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) AC_ARG_VAR([EMACS], [the Emacs editor command]) AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path]) AC_ARG_WITH([lispdir], @@ -36,9 +39,6 @@ AC_DEFUN([AM_PATH_LISPDIR], AC_MSG_CHECKING([where .elc files should go]) AC_MSG_RESULT([$lispdir])], [ - # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [ if test $EMACS != "no"; then if test x${lispdir+set} != xset; then |