diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2009-11-09 13:17:17 -0500 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2009-11-09 13:17:17 -0500 |
commit | 36ae1d9563cff4966b293f816cf9eb25c8ebb857 (patch) | |
tree | cbc2ed689eb2761c1f4fd8dd931718f5737c5b7a /configure.in | |
parent | b322eb4d7a90778dc9f08c73036836deba7e463e (diff) |
Clarify default confdir and cachedir better.
Also remove --with-docdir. It can be set by setting docdir variable.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 750a19b..2b0c182 100644 --- 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 |