From dd600a3ec638c96a6b8ec235a127a7649933d676 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 17 Oct 1996 20:16:27 +0000 Subject: [PATCH] lisp bug fixes --- ChangeLog | 6 ++++++ THANKS | 1 + TODO | 7 +++++++ lib/am/lisp.am | 2 +- lisp.am | 2 +- m4/lispdir.m4 | 14 +++++++------- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45b1ccb3..0c712dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 17 13:45:20 1996 Tom Tromey + + Lisp fixes from Erick Branderhorst: + * m4/lispdir.m4: Define lispdir, not LISPDIR. + * lisp.am: Added missing \. + Fri Oct 11 00:44:49 1996 Tom Tromey * automake.in (handle_source_transform): Only rewrite c, yacc, lex diff --git a/THANKS b/THANKS index e8a33013..96c5df1c 100644 --- a/THANKS +++ b/THANKS @@ -6,6 +6,7 @@ Andreas Schwab Anthony Green David A. Swierczek Dieter Baron +Erick Branderhorst François Pinard Fred Fish Glenn Amerine diff --git a/TODO b/TODO index 00657056..762d49dc 100644 --- a/TODO +++ b/TODO @@ -6,9 +6,14 @@ Priorities for release: * `missing' program * copyrights on m4 files, aclocal output +!! foo_LIBRARIES = @JOE@ -> _LIBFILES is wrong + * BUILT_SOURCES should be examined by automake, %dep_files should be updated to handle it. +* consider adding pkglibexecdir, maybe others? + requests for pkg-dirs with version included + Further: - texinfo/info changes - Per's suggestion @@ -127,6 +132,8 @@ This should work with targets from Makefile.am as well as from .P files, which means rewriting so that the Makefile.am contents aren't copied into the output immediately. This feature is probably required to fully support libtool ("grody compilation issue") + [ this could be probably done more directly by examining the sources + as we scan Makefile.am ] Henrik Frystyk Nielsen says: Henrik> 4) Flags like --include-deps are lost when you make changes to diff --git a/lib/am/lisp.am b/lib/am/lisp.am index d363fcad..af1a0bb3 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -23,7 +23,7 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) list="$(@DIR@_LISP)"; for p in $$list; do \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. - if test -f $${p}c; then + if test -f $${p}c; then \ $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ else : ; fi; \ done diff --git a/lisp.am b/lisp.am index d363fcad..af1a0bb3 100644 --- a/lisp.am +++ b/lisp.am @@ -23,7 +23,7 @@ install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) list="$(@DIR@_LISP)"; for p in $$list; do \ $(INSTALL_DATA) $(srcdir)/$$p $(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. - if test -f $${p}c; then + if test -f $${p}c; then \ $(INSTALL_DATA) $${p}c $(@DIR@dir)/$${p}c; \ else : ; fi; \ done diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 90472774..b04a17ca 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -13,26 +13,26 @@ AC_DEFUN(AM_PATH_LISPDIR, if test $EMACS != "no"; then AC_MSG_CHECKING([where .elc files should go]) dnl Set default value - LISPDIR="\$(datadir)/emacs/site-lisp" + lispdir="\$(datadir)/emacs/site-lisp" if test "x$prefix" = "xNONE"; then if test -d $ac_default_prefix/share/emacs/site-lisp; then - LISPDIR="\$(prefix)/share/emacs/site-lisp" + lispdir="\$(prefix)/share/emacs/site-lisp" else if test -d $ac_default_prefix/lib/emacs/site-lisp; then - LISPDIR="\$(prefix)/lib/emacs/site-lisp" + lispdir="\$(prefix)/lib/emacs/site-lisp" fi fi else if test -d $prefix/share/emacs/site-lisp; then - LISPDIR="\$(prefix)/share/emacs/site-lisp" + lispdir="\$(prefix)/share/emacs/site-lisp" else if test -d $prefix/lib/emacs/site-lisp; then - LISPDIR="\$(prefix)/lib/emacs/site-lisp" + lispdir="\$(prefix)/lib/emacs/site-lisp" fi fi fi - AC_MSG_RESULT($LISPDIR) + AC_MSG_RESULT($lispdir) ELCFILES="\$(ELCFILES)" fi - AC_SUBST(LISPDIR) + AC_SUBST(lispdir) AC_SUBST(ELCFILES)]) -- 2.43.5