From a55bea9d736ce6c07dbb9ab8f4803fb78412226a Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Thu, 21 Feb 2002 22:45:51 +0000 Subject: [PATCH 1/1] 2002-02-22 Steve Youngs * aclocal.m4 (AC_PATH_LISPDIR): Default to .../site-packages/lisp/gnus for XEmacs. (AC_PATH_ETCDIR): Default to .../site-packages/etc/gnus for XEmacs. --- ChangeLog | 7 +++++++ aclocal.m4 | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37e9f3fdc..3910cd521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-22 Steve Youngs + + * aclocal.m4 (AC_PATH_LISPDIR): Default to + .../site-packages/lisp/gnus for XEmacs. + (AC_PATH_ETCDIR): Default to .../site-packages/etc/gnus for + XEmacs. + 2002-02-01 ShengHuo ZHU * etc/gnus/gnus.xpm: Remove some garbages at the end of the file. diff --git a/aclocal.m4 b/aclocal.m4 index 630791096..f68b84425 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -83,11 +83,19 @@ AC_DEFUN(AC_PATH_LISPDIR, [ if test "x$theprefix" = "xNONE"; then theprefix=$ac_default_prefix fi + if test "$EMACS_FLAVOR" = "xemacs"; then + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus" + else lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" + fi for thedir in share lib; do potential= if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then - lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp" + if test "$EMACS_FLAVOR" = "xemacs"; then + lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus" + else + lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp" + fi break fi done @@ -101,7 +109,11 @@ AC_DEFUN(AC_PATH_ETCDIR, [ AC_MSG_CHECKING([where etc files should go]) if test -z "$etcdir"; then dnl Set default value + if test "$EMACS_FLAVOR" = "xemacs"; then + etcdir="\$(lispdir)/../etc/gnus" + else etcdir="\$(lispdir)/../etc" + fi fi AC_MSG_RESULT($etcdir) AC_SUBST(etcdir) -- 2.25.1