[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: lisp bugs
From: |
Tom Tromey |
Subject: |
Patch: lisp bugs |
Date: |
14 Jun 2001 19:53:01 -0600 |
I'm checking this in. It fixes some lisp problems:
* .el.elc rule needed `else' clause
* $(lispdir) might be undefined; in that case we can't install
* uninstall rule printed one thing but ran another
2001-06-14 Tom Tromey <address@hidden>
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.
Tom
Index: lib/am/lisp.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/lisp.am,v
retrieving revision 1.27
diff -u -r1.27 lisp.am
--- lisp.am 2001/04/09 14:46:45 1.27
+++ lisp.am 2001/06/15 01:35:56
@@ -28,7 +28,7 @@
@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 @@
?!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 @@
.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%
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: lisp bugs,
Tom Tromey <=