From 581c79d3ad9fef93190bfaccc7364cdb4b82b344 Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 4 Oct 2005 09:38:50 +0000
Subject: [PATCH] * aclocal.m4 (AC_PATH_LISPDIR): Default to .../site-lisp/gnus
 for Emacs. (AC_PATH_ETCDIR): Don't change the default value for Emacs.

* Makefile.in (list-installed-shadows): New entry.
(remove-installed-shadows): New entry.
---
 ChangeLog   | 13 +++++++++++++
 Makefile.in |  6 ++++++
 aclocal.m4  |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7afa03dcf..d73edb64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* aclocal.m4 (AC_PATH_LISPDIR): Default to .../site-lisp/gnus for
+	Emacs.
+	(AC_PATH_ETCDIR): Don't change the default value for Emacs.
+
+	* configure: Generated.
+
+	* Makefile.in (list-installed-shadows): New entry.
+	(remove-installed-shadows): New entry.
+
+	* GNUS-NEWS: Generated.
+
 2005-09-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* todo: Remove some items that are already done.  Add some new
diff --git a/Makefile.in b/Makefile.in
index d5bc65a14..e588579fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,12 @@ install:
 	cd texi && $(MAKE) EMACS="$(EMACS)" install
 	cd etc && $(MAKE) EMACS="$(EMACS)" install
 
+list-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" list-installed-shadows
+
+remove-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" remove-installed-shadows
+
 uninstall:
 	cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
 	cd texi && $(MAKE) uninstall
diff --git a/aclocal.m4 b/aclocal.m4
index fbf1b2a80..356692666 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -87,7 +87,7 @@ AC_DEFUN(AC_PATH_LISPDIR, [
         datadir="\$(prefix)/lib"
         lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus"
     else
-    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus"
     fi
     for thedir in share lib; do
 	potential=
@@ -95,7 +95,7 @@ AC_DEFUN(AC_PATH_LISPDIR, [
            if test "$EMACS_FLAVOR" = "xemacs"; then
 	       lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus"
            else
-               lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+               lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/gnus"
            fi
 	   break
 	fi
@@ -113,7 +113,7 @@ AC_DEFUN(AC_PATH_ETCDIR, [
     if test "$EMACS_FLAVOR" = "xemacs"; then
       etcdir="\$(lispdir)/../../etc"
     else
-    etcdir="\$(lispdir)/../etc"
+      etcdir="\$(lispdir)/../../etc"
     fi
   fi
   AC_MSG_RESULT($etcdir)
-- 
2.25.1