Clarify default confdir and cachedir better.

Also remove --with-docdir.  It can be set by setting docdir variable.

diff --git a/configure.in b/configure.in
index 750a19bcb3e64f99ad25e4557a5421148a00fea8..2b0c1827b0f0d752362deca79d7ed382ed3969a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -448,7 +448,7 @@ AC_SUBST(FC_FONTPATH)
 #
 # Set default cache directory path
 #
-AC_ARG_WITH(cache-dir,         [ --with-cache-dir=DIR           Use DIR to store cache files (default /var/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
+AC_ARG_WITH(cache-dir,         [  --with-cache-dir=DIR           Use DIR to store cache files (default LOCALSTATEDIR/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
 
 case $fc_cachedir in
 no|yes)
@@ -469,7 +469,7 @@ FC_FONTDATE=`LC_ALL=C date`
 
 AC_SUBST(FC_FONTDATE)
 
-AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default /etc/fonts)], confdir="$withval", confdir=yes)
+AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default SYSCONFDIR/fonts)], confdir="$withval", confdir=yes)
 
 #
 # Set CONFDIR and FONTCONFIG_PATH
@@ -529,21 +529,6 @@ fi
 AC_SUBST(DOCSRC)
 AC_SUBST(DOCMAN3)
 
-#
-# Figure out where to install documentation
-#
-
-AC_ARG_WITH(docdir,           [  --with-docdir=DIR             Use DIR to store documentation files (default ${datadir}/doc/fontconfig)], confdir="$withval")
-
-if test "x$with_docdir" = "x" ; then
-  DOCDIR='${datadir}/doc/fontconfig'
-else
-  DOCDIR=$with_docdir
-fi
-
-AC_SUBST(DOCDIR)
-
-
 AC_OUTPUT([
 Makefile 
 fontconfig/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9ffd54fcf3398556d8ece0a99d9b65a26a0f5360..49e00e15571df92617ab822f760f8bb0b8118f91 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -89,8 +89,6 @@ man3_MANS=$(DOCMAN3)
 noinst_PROGRAMS=edit-sgml
 edit_sgml_SOURCES=edit-sgml.c
 
-docdir=@DOCDIR@
-
 DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
 LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*