From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/44420 Path: main.gmane.org!not-for-mail From: Steve Youngs Newsgroups: gmane.emacs.gnus.general Subject: [PATCH] Fixes to install directories for XEmacs Date: Fri, 26 Apr 2002 16:48:25 +1000 Organization: The XEmacs Development Team Sender: owner-ding@hpc.uh.edu Message-ID: NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1019839278 25720 127.0.0.1 (26 Apr 2002 16:41:18 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 26 Apr 2002 16:41:18 +0000 (UTC) Keywords: info,changelog,dir,texi,gnus,xemacs,etcdir,dnl,diff,configure,path,prefix Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 1718mb-0006gj-00 for ; Fri, 26 Apr 2002 18:41:17 +0200 Original-Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1718lJ-0003lH-00; Fri, 26 Apr 2002 11:39:57 -0500 Original-Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Fri, 26 Apr 2002 11:40:09 -0500 (CDT) Original-Received: from epithumia.math.uh.edu (epithumia.math.uh.edu [129.7.128.2]) by sina.hpc.uh.edu (8.9.3/8.9.3) with ESMTP id LAA11784 for ; Fri, 26 Apr 2002 11:40:03 -0500 (CDT) Original-Received: (from tibbs@localhost) by epithumia.math.uh.edu (8.11.2/8.11.1) id g3QGdkC06129 for ding@hpc.uh.edu; Fri, 26 Apr 2002 11:39:46 -0500 Original-Received: from sclp3.sclp.com (qmailr@sclp3.sclp.com [209.196.61.66]) by sina.hpc.uh.edu (8.9.3/8.9.3) with SMTP id BAA09416 for ; Fri, 26 Apr 2002 01:51:18 -0500 (CDT) Original-Received: (qmail 2748 invoked by alias); 26 Apr 2002 06:51:00 -0000 Original-Received: (qmail 2743 invoked from network); 26 Apr 2002 06:51:00 -0000 Original-Received: from mta03bw.bigpond.com (139.134.6.86) by gnus.org with SMTP; 26 Apr 2002 06:51:00 -0000 Original-Received: from eicq.dnsalias.org ([144.135.24.81]) by mta03bw.bigpond.com (Netscape Messaging Server 4.15 mta03bw Feb 26 2002 03:44:21) with SMTP id GV5XO500.I2D for ; Fri, 26 Apr 2002 16:50:29 +1000 Original-Received: from CTPP-p-144-134-41-9.prem.tmns.net.au ([144.134.41.9]) by bwmam05.mailsvc.email.bigpond.com(MailRouter V3.0l 38/206285); 26 Apr 2002 16:50:29 Original-Received: (from steve@localhost) by eicq.dnsalias.org (8.12.0.Beta7/8.12.0.Beta7) id g3Q6mPIa002388; Fri, 26 Apr 2002 16:48:25 +1000 Mail-Copies-To: never Original-To: Gnus List X-Attribution: SY X-URL: X-Face: %@A&y\ef)A6pi|q43;M>uyhO)~NP*fpdo0XrUuutf0|nku\O5JV(7EG%odc'n6}G@tYRl+B #[n,%B`.sHZ5>3MZvrm%,rWE7)c}ZXjH\>=p@AL\y\gyu|.lJ8B`F++86 Original-Lines: 127 User-Agent: Gnus/5.090006 (Oort Gnus v0.06) XEmacs/21.5 (beets, i686-pc-linux) Precedence: list X-Majordomo: 1.94.jlt7 Xref: main.gmane.org gmane.emacs.gnus.general:44420 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:44420 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 + + * 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 + + * 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 -- |---------------------| | XEmacs - It's not just an editor. | | It's a way of life. | |---------------------------------------|