[Fontconfig] Issues with current cvs

[Patrick Lam]

Behdad Esfahbod wrote:
> On Tue, 31 Jan 2006, Patrick Lam wrote:
> 
> 
>>>Seems like to me that changing the Makefile.am's like this will
>>>fix it:
>>>
>>>For doc/Makefile.am:
>>>
>>>- FNCS_TMPL = ${DOC_SRC}/func.sgml
>>>+ FNCS_TMPL = func.sgml
>>
>>That doesn't quite work...
> 
> 
> Ok, then just make sure "func.sgml" is listed in EXTRA_DIST
> instead of $(FNCS_TMPL).

That's not quite right either:

./edit-sgml  < 'fcatomic.fncs' > fcatomic.sgml
fatal: usage: ./edit-sgml <template.sgml>

using this diff (I also tried with EXTRA_DIST=${DOC_SRC}/func.sgml).

Index: doc/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/doc/Makefile.am,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.am
--- doc/Makefile.am     3 Mar 2005 01:59:28 -0000       1.22
+++ doc/Makefile.am     31 Jan 2006 16:08:09 -0000
@@ -37,7 +37,7 @@ PDF = fontconfig-user.pdf fontconfig-dev
 HTML_FILES = fontconfig-user.html
 HTML_DIR = fontconfig-devel
 SGML = fontconfig-user.sgml fontconfig-devel.sgml
-FNCS_TMPL = ${DOC_SRC}/func.sgml
+FNCS_TMPL =

 DOC_FUNCS_FNCS=\
        fcatomic.fncs \
@@ -86,7 +86,7 @@ docdir=@DOCDIR@
 DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
 LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*

-EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL)
confdir.sgml.in+EXTRA_DIST=$(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS)
func.sgml confdir.sgml.in

 SUFFIXES=.fncs .sgml .txt .html