lisp bug fixes

diff --git a/ChangeLog b/ChangeLog
index 45b1ccb349280224104b4782cc96306c15b667d2..0c712dda0f9d0a2c64839bf18f440f79cb237004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 17 13:45:20 1996  Tom Tromey  <tromey@cygnus.com>
+
+       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  <tromey@cygnus.com>
 
        * automake.in (handle_source_transform): Only rewrite c, yacc, lex

diff --git a/THANKS b/THANKS
index e8a3301333974462a79f1be3b9be095783a21a82..96c5df1c880c9738cf9b7df4970c94d540075e4d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Anthony Green <green@cygnus.com>
 David A. Swierczek <swiercze@mr.med.ge.com>
 Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
+Erick Branderhorst <branderh@iaehv.nl>
 François Pinard <pinard@iro.umontreal.ca>
 Fred Fish <fnf@ninemoons.com>
 Glenn Amerine <glenn@pie.mhsc.org>

diff --git a/TODO b/TODO
index 006570560bd92f61aa69a85a6300736eab540944..762d49dc93f981c4918b127ce04e82868a61e782 100644 (file)
--- 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 d363fcadc30d087e35db1e610ea2ac955864d3a5..af1a0bb382f57f9d4adf07e93976ecc1d98399fc 100644 (file)
--- 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 d363fcadc30d087e35db1e610ea2ac955864d3a5..af1a0bb382f57f9d4adf07e93976ecc1d98399fc 100644 (file)
--- 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 904727744fcf8c873db4d4702077055591f46627..b04a17ca9fd96da459cecba2942aa5c65db3c20e 100644 (file)
--- 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)])