X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=doc%2FMakefile.am;h=49e00e15571df92617ab822f760f8bb0b8118f91;hb=caa4bec9459af0779d1d16ba66964593e5748e3c;hp=7a9a7c290dab2671648ba2dd85163c65fbc4d9d9;hpb=9bfb41ffefe41c90c8b16e155e04e6c6a5a2c1fd;p=fontconfig.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7a9a7c2..49e00e1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id$
+# fontconfig/doc/Makefile.am
 #
 # Copyright © 2003 Keith Packard
 #
@@ -13,9 +13,9 @@
 # representations about the suitability of this software for any purpose.  It
 # is provided "as is" without express or implied warranty.
 #
-# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -49,6 +49,7 @@ DOC_FUNCS_FNCS=\
 	fcdircache.fncs \
 	fcfile.fncs \
 	fcfontset.fncs \
+	fcformat.fncs \
 	fcfreetype.fncs \
 	fcinit.fncs \
 	fclangset.fncs \
@@ -70,6 +71,7 @@ DOC_FUNCS_SGML=\
 	fcdircache.sgml \
 	fcfile.sgml \
 	fcfontset.sgml \
+	fcformat.sgml \
 	fcfreetype.sgml \
 	fcinit.sgml \
 	fclangset.sgml \
@@ -87,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)/*
 
@@ -118,9 +118,11 @@ $(man3_MANS): func.refs
 
 func.refs: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) func.refs
-	$(DOC2MAN) local-fontconfig-devel.sgml && \
-	mv manpage.refs func.refs
-	$(RM) manpage.links
+	$(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
+	mv devel-man/manpage.refs func.refs && \
+	mv devel-man/*.3 . && \
+	$(RM) devel-man/manpage.* && \
+	rmdir devel-man
 
 local-fontconfig-devel.sgml: fontconfig-devel.sgml
 	$(LN_S) $< $@
@@ -130,7 +132,7 @@ $(DOC_FUNCS_SGML): edit-sgml$(EXEEXT) $(FNCS_TMPL)
 fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@
 	$(DOC2MAN) local-fontconfig-user.sgml && \
-	$(RM) manpage.refs manpage.links
+	$(RM) manpage.*
 	
 local-fontconfig-user.sgml: fontconfig-user.sgml
 	$(LN_S) $< $@
@@ -143,7 +145,7 @@ clean-local:
 
 $(HTML_DIR): local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) -r $(HTML_DIR)
-	$(DOC2HTML) -o $(HTML_DIR) local-fontconfig-devel.sgml
+	$(DOC2HTML) -V '%use-id-as-filename%' -o $(HTML_DIR) local-fontconfig-devel.sgml
 
 fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) $@