Re: tramp 2.1.4 install problem - bug or mis-configured?

[Michael Albinus]

Paul Lew <address@hidden> writes:

> Thanks for the patch, applied but got strange error, please see the
> attached log file.

Grrr, you are right. I didn't check the info generation. Here's
another version of the patch.

Best regards, Michael.

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/tramp/tramp/aclocal.m4,v
retrieving revision 2.17
diff -u -r2.17 aclocal.m4
--- aclocal.m4  11 Oct 2005 21:58:44 -0000      2.17
+++ aclocal.m4  18 Oct 2005 18:49:41 -0000
@@ -218,9 +218,9 @@
   AC_MSG_CHECKING([datadir])
 
   if test "$EMACS_INFO" = "xemacs"; then
-     datadir_default="${prefix}/lib"
+     datadir_default="\${prefix}/lib"
   else
-     datadir_default="${prefix}/share"
+     datadir_default="\${prefix}/share"
   fi
 
   if test "${datadir}" = "\${prefix}/share"; then
@@ -246,10 +246,15 @@
 dnl       [[DATADIR/xemacs/site-lisp]]]))
   AC_MSG_CHECKING([lispdir])
 
-  lispdir_default="${datadir}/${EMACS_INFO}/site-lisp"
+  lispdir_default="\${datadir}/${EMACS_INFO}/site-lisp"
 
   : ${lispdir:=$lispdir_default}
 
+  dnl Expand $lispdir_default for trampinst.texi.
+  lispdir_default=$(echo ${lispdir_default} | \
+                    sed -e "s#[$][{]datadir[}]#$datadir#" \
+                        -e "s#[$][{]prefix[}]#$prefix#")
+
   AC_MSG_RESULT($lispdir)
 ])
 
@@ -263,23 +268,40 @@
   dnl Check infodir.
   AC_MSG_CHECKING([infodir])
 
+  dnl Check default places.
   if test "$EMACS_INFO" = "xemacs"; then
-     infodir_default="${datadir}/xemacs/info"
+     infodir_default="\${datadir}/xemacs/info"
   else
-     infodir_default="${datadir}/info"
+     infodir_default="\${datadir}/info"
   fi
 
-  if ! test -d "$infodir_default"; then
-     infodir_default="${prefix}/info"
+  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
 
-  if ! test -d "$infodir_default"; then
-     infodir_default="${prefix_default}/info"
+  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
+
+  dnl Expand $infodir_default for trampinst.texi.
+  infodir_default=$(echo ${infodir_default} | \
+                    sed -e "s#[$][{]datadir[}]#$datadir#" \
+                        -e "s#[$][{]prefix[}]#$prefix#")
 
   AC_MSG_RESULT([$infodir])
 ])