[PATCH] Fixes to install directories for XEmacs

[PATCH] Fixes to install directories for XEmacs

[Steve Youngs]

This fixes a minor bug (that I introduced) that caused the installed
etc directory to be etc/gnus/gnus in XEmacs.

Also, the info files now get installed to site-packages/info for
XEmacs and $prefix/info for Emacs.  This of course can be overridden
with the --infodir configure option.

I didn't update 'configure' with autoconf because I have autoconf-2.5
and wasn't sure if that would be OK.


gnus patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected:               texi/ChangeLog ChangeLog
Source files diff command:    cvs -q diff -u
Files affected:               texi/Makefile.in configure.in aclocal.m4

Index: ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/ChangeLog,v
retrieving revision 6.31
diff -u -U0 -r6.31 ChangeLog
--- ChangeLog	2002/02/21 22:45:51	6.31
+++ ChangeLog	2002/04/26 06:41:05
@@ -0,0 +1,9 @@
+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'.
+
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/gnus/aclocal.m4,v
retrieving revision 6.6
diff -u -u -r6.6 aclocal.m4
--- aclocal.m4	2002/02/21 22:45:51	6.6
+++ aclocal.m4	2002/04/26 06:40:51
@@ -108,15 +108,36 @@
   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
   fi
   AC_MSG_RESULT($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
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/gnus/configure.in,v
retrieving revision 6.4
diff -u -u -r6.4 configure.in
--- configure.in	2001/09/27 14:03:32	6.4
+++ configure.in	2002/04/26 06:40:51
@@ -20,6 +20,7 @@
 
 AC_PATH_LISPDIR
 AC_PATH_ETCDIR
+AC_PATH_INFO_DIR
 AC_CHECK_URL
 AC_CHECK_W3
 GNUS_CHECK_FONTS
Index: texi/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/texi/ChangeLog,v
retrieving revision 6.310
diff -u -U0 -r6.310 ChangeLog
--- texi/ChangeLog	2002/04/09 18:54:17	6.310
+++ texi/ChangeLog	2002/04/26 06:41:15
@@ -0,0 +1,5 @@
+2002-04-26  Steve Youngs  <youngs@xemacs.org>
+
+	* Makefile.in (infodir): Set to '@info_dir@' so we can separate
+	defaults for XEmacs and Emacs.
+
Index: texi/Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/gnus/texi/Makefile.in,v
retrieving revision 6.24
diff -u -u -r6.24 Makefile.in
--- texi/Makefile.in	2002/03/24 22:54:52	6.24
+++ texi/Makefile.in	2002/04/26 06:40:59
@@ -1,4 +1,4 @@
-infodir = @infodir@
+infodir = @info_dir@
 prefix = @prefix@
 srcdir = @srcdir@
 subdir = texi

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<youngs@xemacs.org>---|

Re: [PATCH] Fixes to install directories for XEmacs

[ShengHuo ZHU]

Steve Youngs <youngs@xemacs.org> writes:

> This fixes a minor bug (that I introduced) that caused the installed
> etc directory to be etc/gnus/gnus in XEmacs.
>
> Also, the info files now get installed to site-packages/info for
> XEmacs and $prefix/info for Emacs.  This of course can be overridden
> with the --infodir configure option.
>
> I didn't update 'configure' with autoconf because I have autoconf-2.5
> and wasn't sure if that would be OK.

Installed. Thanks.

ShengHuo

Re: [PATCH] Fixes to install directories for XEmacs

[Steve Youngs]

|--==> "ZSH" == ShengHuo ZHU <zsh@cs.rochester.edu> writes:

  ZSH> Installed. Thanks.

You're welcome.

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<youngs@xemacs.org>---|