*** aclocal.m4.~1~	Thu Oct 13 10:33:58 2005
--- aclocal.m4	Tue Oct 18 16:45:43 2005
***************
*** 218,226 ****
    AC_MSG_CHECKING([datadir])
  
    if test "$EMACS_INFO" = "xemacs"; then
!      datadir_default="${prefix}/lib"
    else
!      datadir_default="${prefix}/share"
    fi
  
    if test "${datadir}" = "\${prefix}/share"; then
--- 218,226 ----
    AC_MSG_CHECKING([datadir])
  
    if test "$EMACS_INFO" = "xemacs"; then
!      datadir_default="\${prefix}/lib"
    else
!      datadir_default="\${prefix}/share"
    fi
  
    if test "${datadir}" = "\${prefix}/share"; then
***************
*** 246,252 ****
  dnl       [[DATADIR/xemacs/site-lisp]]]))
    AC_MSG_CHECKING([lispdir])
  
!   lispdir_default="${datadir}/${EMACS_INFO}/site-lisp"
  
    : ${lispdir:=$lispdir_default}
  
--- 246,252 ----
  dnl       [[DATADIR/xemacs/site-lisp]]]))
    AC_MSG_CHECKING([lispdir])
  
!   lispdir_default="\${datadir}/${EMACS_INFO}/site-lisp"
  
    : ${lispdir:=$lispdir_default}
  
***************
*** 263,282 ****
    dnl Check infodir.
    AC_MSG_CHECKING([infodir])
  
    if test "$EMACS_INFO" = "xemacs"; then
!      infodir_default="${datadir}/xemacs/info"
    else
!      infodir_default="${datadir}/info"
    fi
  
!   if ! test -d "$infodir_default"; then
!      infodir_default="${prefix}/info"
    fi
  
!   if ! test -d "$infodir_default"; then
!      infodir_default="${prefix_default}/info"
    fi
  
    if test "${infodir}" = "\${prefix}/info"; then
       infodir=$infodir_default
    fi
--- 263,294 ----
    dnl Check infodir.
    AC_MSG_CHECKING([infodir])
  
+   dnl Check default places.
    if test "$EMACS_INFO" = "xemacs"; then
!      infodir_default="\${datadir}/xemacs/info"
    else
!      infodir_default="\${datadir}/info"
    fi
  
!   dnl If default directory doesn't exist, derive from $prefix.
!   dnl ${prefix} and ${datadir} must be expanded for test.
!   if ! test -d $(echo ${infodir_default} | \
!                  sed -e "s#[$][{]datadir[}]#$datadir#" \
!                      -e "s#[$][{]prefix[}]#$prefix#")
!   then
!      infodir_default="\${prefix}/info"
    fi
  
!   dnl If default directory doesn't exist, derive from $prefix_default.
!   dnl ${prefix} and ${datadir} must be expanded for test.
!   if ! test -d $(echo ${infodir_default} | \
!                  sed -e "s#[$][{]datadir[}]#$datadir#" \
!                      -e "s#[$][{]prefix[}]#$prefix#")
!   then
!      infodir_default="\${prefix_default}/info"
    fi
  
+   dnl Set it if necessary.
    if test "${infodir}" = "\${prefix}/info"; then
       infodir=$infodir_default
    fi