diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-31 16:12:53 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-31 16:12:53 +0000 |
| commit | d2a0573ba14dd20790313317b978b7fb38ab8f13 (patch) | |
| tree | de5818d3a1d0298697f09b8243fa2e368a0de003 /lib/fontconfig | |
| parent | 5c229a8b797580c65a535346fbfba46587c97241 (diff) | |
Fix doc build/install (based on a patch from dim@) and re-enable it.
Diffstat (limited to 'lib/fontconfig')
| -rw-r--r-- | lib/fontconfig/Makefile.bsd-wrapper | 5 | ||||
| -rw-r--r-- | lib/fontconfig/doc/Makefile.am | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/fontconfig/Makefile.bsd-wrapper b/lib/fontconfig/Makefile.bsd-wrapper index 80fcba890..b888e3797 100644 --- a/lib/fontconfig/Makefile.bsd-wrapper +++ b/lib/fontconfig/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2006/12/31 15:33:12 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2006/12/31 16:12:52 matthieu Exp $ SHARED_LIBS= fontconfig 5.1 @@ -6,7 +6,6 @@ CONFIGURE_ARGS= --with-expat=${X11BASE} --sysconfdir=/etc \ --mandir=${X11BASE}/man \ --with-cache-dir=/var/cache/fontconfig \ --with-default-fonts=${X11BASE}/lib/X11/fonts \ - --with-add-fonts=/usr/local/lib/X11/fonts \ - --disable-docs + --with-add-fonts=/usr/local/lib/X11/fonts .include <bsd.xorg.mk> diff --git a/lib/fontconfig/doc/Makefile.am b/lib/fontconfig/doc/Makefile.am index 1ec8c0b3f..d238bfde1 100644 --- a/lib/fontconfig/doc/Makefile.am +++ b/lib/fontconfig/doc/Makefile.am @@ -82,7 +82,7 @@ edit_sgml_SOURCES=edit-sgml.c docdir=@DOCDIR@ DOC_FILES=$(TXT) $(PDF) $(HTML_FILES) -LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/* +LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*.html EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) func.sgml confdir.sgml.in @@ -168,13 +168,13 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml -htmldoc_DATA = $(HTML_DIR)/* +htmldoc_DATA = $(HTML_DIR)/*.html $(HTML_DIR)/*: $(HTML_DIR) else -htmldoc_DATA = $(srcdir)/$(HTML_DIR)/* +htmldoc_DATA = $(srcdir)/$(HTML_DIR)/*.html all-local: clean-local: |