X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=aclocal.m4;h=4773670807b59abfef54361d284765cee697eb94;hp=03a55281c98fbe08f331dbeaeca84bad2de1895c;hb=2596d578acd0e2f3d659b332a866d227010e6ce4;hpb=363be8f069f55f9fe6a98798384c2cdd97b740d4

diff --git a/aclocal.m4 b/aclocal.m4
index 03a55281c..477367080 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -87,15 +87,16 @@ 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=
-	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
+	dnl The directory name should be quoted because it might contain spaces.
+	if test -d "${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp"; then
            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 +114,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)