* m4/lispdir.m4 (AM_PATH_LISPDIR): Correctly find xemacs and

	xemacs install directories.  From Robert Bihlmeyer.

diff --git a/ChangeLog b/ChangeLog
index 7ee86ab..3a2879b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Oct  1 00:51:51 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Correctly find xemacs and
+       xemacs install directories.  From Robert Bihlmeyer.
+
        * depend2.am: Don't bother trying to delete source file from
        list.
 

diff --git a/HACKING b/HACKING
index 390d91c..6bde75a 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -43,6 +43,8 @@
 * Use `##' comments liberally.  Comment anything even remotely
   unusual.
 
+* Never use basename or dirname.  Instead use sed
+
 
 ================================================================
 = Editing automake.in and aclocal.in

diff --git a/THANKS b/THANKS
index 54d20c8..54272d2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -71,6 +71,7 @@ Raja R Harinath               harinath@cs.umn.edu
 Ralph Schleicher       rs@purple.UL.BaWue.DE
 Ramón García Fernández ramon@jl1.quim.ucm.es
 Rob Savoye             rob@cygnus.com
+Robert Bihlmeyer       robbe@orcus.priv.at
 Seth Alves             alves@hungry.com
 Steve M. Robbins       steve@nyongwa.montreal.qc.ca
 Tatu Ylonen            ylo@ssh.fi

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 33e7650..1f8ad10 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -9,25 +9,26 @@ AC_DEFUN(AM_PATH_LISPDIR,
  [# If set to t, that means we are running in a shell under Emacs.
   # If you have an Emacs named "t", then use the full path.
   test "$EMACS" = t && EMACS=
-  AC_PATH_PROG(EMACS, emacs xemacs, no)
+  AC_PATH_PROGS(EMACS, emacs xemacs, no)
   if test $EMACS != "no"; then
     AC_MSG_CHECKING([where .elc files should go])
     dnl Set default value
     lispdir="\$(datadir)/emacs/site-lisp"
+    emacs_flavor=`echo "$EMACS" | sed -e ',^.*/,,'`
     if test "x$prefix" = "xNONE"; then
-      if test -d $ac_default_prefix/share/emacs/site-lisp; then
-       lispdir="\$(prefix)/share/emacs/site-lisp"
+      if test -d $ac_default_prefix/share/$emacs_flavor/site-lisp; then
+       lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
       else
-       if test -d $ac_default_prefix/lib/emacs/site-lisp; then
-         lispdir="\$(prefix)/lib/emacs/site-lisp"
+       if test -d $ac_default_prefix/lib/$emacs_flavor/site-lisp; then
+         lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
        fi
       fi
     else
-      if test -d $prefix/share/emacs/site-lisp; then
-       lispdir="\$(prefix)/share/emacs/site-lisp"
+      if test -d $prefix/share/$emacs_flavor/site-lisp; then
+       lispdir="\$(prefix)/share/$emacs_flavor/site-lisp"
       else
-       if test -d $prefix/lib/emacs/site-lisp; then
-         lispdir="\$(prefix)/lib/emacs/site-lisp"
+       if test -d $prefix/lib/$emacs_flavor/site-lisp; then
+         lispdir="\$(prefix)/lib/$emacs_flavor/site-lisp"
        fi
       fi
     fi