Fix some lisp bugs reported by Bruno Haible:

	* lib/am/lisp.am (uninstall-%DIR%LISP): Added DESTDIR to the
	echo.
	(install-%DIR%LISP): Handle case where lispdir is not defined.
	(uninstall-%DIR%LISP): Likewise.
	(.el.elc): Added `else' clause.

diff --git a/ChangeLog b/ChangeLog
index 5bfaa4513f34dc01a9a5c9bde54834ef34403615..d429a05eb5322a6a8f6812924b8345c6f7b5e109 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2001-06-14  Tom Tromey  <tromey@redhat.com>
 
+       Fix some lisp bugs reported by Bruno Haible:
+       * lib/am/lisp.am (uninstall-%DIR%LISP): Added DESTDIR to the
+       echo.
+       (install-%DIR%LISP): Handle case where lispdir is not defined.
+       (uninstall-%DIR%LISP): Likewise.
+       (.el.elc): Added `else' clause.
+
        Fix for bug reported by Steve M. Robbins:
        * automake.in (handle_single_transform_list): When building a file
        from a subdirectory, continue to use `AM_' prefix.

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 323cda48ea7e6fdae1c7c301d3a478f0d5e354b1..7789540be184685f7ee0569b90ce05cc59665791 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -28,7 +28,7 @@ lispdir = @lispdir@
        @echo 'WARNING: Warnings can be ignored. :-)'
        if test $(EMACS) != no; then \
          EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<; \
-       fi
+       else : ; fi
 
 ## ------------ ##
 ## Installing.  ##
@@ -40,22 +40,25 @@ _am_installdirs += $(DESTDIR)$(%NDIR%dir)
 ?!EXEC?.PHONY install-data-am: install-%DIR%LISP
 install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+## lispdir might not be defined.
+       @if test -n "$(lispdir)"; then
+         $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir); \
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       @list='$(%DIR%_LISP)'; for p in $$list; do \
+         list='$(%DIR%_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?            f="$$p"; \
+           echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+           $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
 ## Only install .elc file if it exists.
-         if test -f $${p}c; then \
-           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-           $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-         else : ; fi; \
-       done
+           if test -f $${p}c; then \
+             echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+             $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+           else : ; fi; \
+         done; \
+       else : ; fi
 endif %?INSTALL%
 
 
@@ -67,12 +70,15 @@ if %?INSTALL%
 .PHONY uninstall-am: uninstall-%DIR%LISP
 uninstall-%DIR%LISP:
        @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_LISP)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-       done
+## lispdir might not be defined.
+       @if test -n "$(lispdir)"; then
+         list='$(%DIR%_LISP)'; for p in $$list; do \
+?BASE?     f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?            f="$$p"; \
+           echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+           rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+         done; \
+       else : ; fi
 endif %?INSTALL%