diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-10-21 16:29:04 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-10-21 16:29:04 +0000 |
| commit | 44784989cab68201bef7b36c6982ed15959f5f49 (patch) | |
| tree | e7503ec9bf92b94ec2c8405c9a17b6a4cade6396 /lib/am/lisp.am | |
| parent | 7e5770f9f3f4d4291cb3e54d58396ef408503f7a (diff) | |
| download | automake-44784989cab68201bef7b36c6982ed15959f5f49.tar.gz | |
* m4/lispdir.m4 (AM_PATH_LISPDIR): Always check for Emacs.
Always define lispdir.
* lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Check
$(EMACS) to decide whether _LISP files must be installed,
not $(lispdir).
* doc/automake.texi (Emacs Lisp): Mention the two ways to install
non byte-compiled Emacs lisp files.
* tests/lisp4.test, tests/lisp5.test: Check "make install"
when EMACS=no.
Suggested by Simon Josefsson.
Diffstat (limited to 'lib/am/lisp.am')
| -rw-r--r-- | lib/am/lisp.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/am/lisp.am b/lib/am/lisp.am index daea72ef6..f7d5d5906 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -58,8 +58,8 @@ am__installdirs += $(DESTDIR)$(%NDIR%dir) ?!EXEC?.PHONY install-data-am: install-%DIR%LISP install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) @$(NORMAL_INSTALL) -## lispdir might not be defined. - @if test -n "$(lispdir)"; then \ +## Do not install anything if EMACS was not found. + @if test "$(EMACS)" != no; then \ $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. @@ -88,8 +88,8 @@ if %?INSTALL% .PHONY uninstall-am: uninstall-%DIR%LISP uninstall-%DIR%LISP: @$(NORMAL_UNINSTALL) -## lispdir might not be defined. - @if test -n "$(lispdir)"; then \ +## Do not uninstall anything if EMACS was not found. + @if test "$(EMACS)" != no; then \ list='$(%DIR%_LISP)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ |