diff configure.in @ 349:8429d81ab209 r21-1-4

Import from CVS: tag r21-1-4
author cvs
date Mon, 13 Aug 2007 10:54:28 +0200
parents 7c94d56991e1
children 3b3709405255
line wrap: on
line diff
--- a/configure.in	Mon Aug 13 10:53:50 2007 +0200
+++ b/configure.in	Mon Aug 13 10:54:28 2007 +0200
@@ -351,6 +351,7 @@
 etcdir='${datadir}/${PROGNAME}-${version}/etc'
 lockdir='${statedir}/${PROGNAME}/lock'
 archlibdir='${libdir}/${PROGNAME}-${version}/${configuration}'
+docdir='${archlibdir}'
 with_site_lisp='no'
 with_menubars=''
 with_scrollbars=''
@@ -715,6 +716,7 @@
  	        AC_DEFINE(LISPDIR_USER_DEFINED)
 	        AC_DEFINE(ETCDIR_USER_DEFINED) ;;
              statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;;
+	     docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;;
              exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;;
            esac
 	;;
@@ -3836,6 +3838,17 @@
 done
 AC_SUBST(LOCKDIR)
 
+AC_SUBST(docdir)
+AC_SUBST(DOCDIR_USER_DEFINED)
+DOCDIR=$docdir
+while true; do
+  case "$DOCDIR" in
+    *\$* ) eval "DOCDIR=$DOCDIR" ;;
+    *) break ;;
+  esac
+done
+AC_SUBST(DOCDIR)
+
 AC_SUBST(archlibdir)
 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
 ARCHLIBDIR=$archlibdir