2002-04-26 Steve Youngs <youngs@xemacs.org>

	* aclocal.m4 (AC_PATH_INFODIR): New.  Defaults to '$prefix/info'
	for Emacs and 'site-packages/info' for XEmacs.
	(AC_PATH_ETCDIR): Drop 'gnus' off the end of the default directory
	for XEmacs.

	* configure.in: Use 'AC_PATH_INFO_DIR'.

2002-04-26  Steve Youngs  <youngs@xemacs.org>

	* Makefile.in (infodir): Set to '@info_dir@' so we can separate
	defaults for XEmacs and Emacs.

diff --git a/ChangeLog b/ChangeLog
index 3910cd5..a0f1cd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-26  Steve Youngs  <youngs@xemacs.org>
+
+       * aclocal.m4 (AC_PATH_INFODIR): New.  Defaults to '$prefix/info'
+       for Emacs and 'site-packages/info' for XEmacs.
+       (AC_PATH_ETCDIR): Drop 'gnus' off the end of the default directory
+       for XEmacs.
+
+       * configure.in: Use 'AC_PATH_INFO_DIR'.
+
 2002-02-22  Steve Youngs  <youngs@xemacs.org>
 
        * aclocal.m4 (AC_PATH_LISPDIR): Default to

diff --git a/aclocal.m4 b/aclocal.m4
index f68b844..4e4e435 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -108,9 +108,9 @@ AC_DEFUN(AC_PATH_ETCDIR, [
   AC_ARG_WITH(etcdir,[  --with-etcdir=DIR       Where to install etc files], etcdir=${withval})
   AC_MSG_CHECKING([where etc files should go])
   if test -z "$etcdir"; then
-    dnl Set default value
+    dnl Set default value.
     if test "$EMACS_FLAVOR" = "xemacs"; then
-      etcdir="\$(lispdir)/../etc/gnus"
+      etcdir="\$(lispdir)/../../etc"
     else
     etcdir="\$(lispdir)/../etc"
     fi
@@ -119,6 +119,27 @@ AC_DEFUN(AC_PATH_ETCDIR, [
   AC_SUBST(etcdir)
 ])
 
+dnl 
+dnl This is a bit on the "evil hack" side of things.  It is so we can
+dnl have a different default infodir for XEmacs.  A user can still specify
+dnl someplace else with '--infodir=DIR'.
+dnl
+AC_DEFUN(AC_PATH_INFO_DIR, [
+  AC_MSG_CHECKING([where the TeXinfo docs should go])
+  dnl Set default value.  This must be an absolute path.
+  if test "$infodir" = "\${prefix}/info"; then
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+      info_dir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/info"
+    else
+      info_dir="\$(prefix)/info"
+    fi
+  else
+    info_dir=$infodir
+  fi
+  AC_MSG_RESULT($info_dir)
+  AC_SUBST(info_dir)
+])
+
 dnl
 dnl Check whether a function exists in a library
 dnl All '_' characters in the first argument are converted to '-'

diff --git a/configure.in b/configure.in
index 5368962..59ed851 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,7 @@ AC_CHECK_PROG(EMACS, emacs, emacs, xemacs)
 
 AC_PATH_LISPDIR
 AC_PATH_ETCDIR
+AC_PATH_INFO_DIR
 AC_CHECK_URL
 AC_CHECK_W3
 GNUS_CHECK_FONTS

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 48b266b..90f16a5 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26  Steve Youngs  <youngs@xemacs.org>
+
+       * Makefile.in (infodir): Set to '@info_dir@' so we can separate
+       defaults for XEmacs and Emacs.
+
 2002-04-27  Jesper Harder  <harder@ifa.au.dk>
 
        * emacs-mime.texi (Customization): Update info on HTML renderers.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 6bc24a4..d2ba870 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -1,4 +1,4 @@
-infodir = @infodir@
+infodir = @info_dir@
 prefix = @prefix@
 srcdir = @srcdir@
 subdir = texi