walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clarify default confdir and cachedir better. 

Also remove --with-docdir.  It can be set by setting docdir variable.
This commit is contained in:
Behdad Esfahbod 2009-11-09 13:17:17 -05:00
parent b322eb4d7a
commit 36ae1d9563
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -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

2
doc/Makefile.am
View File

@ -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)/*