[Fontconfig] Issues with current cvs

[Behdad Esfahbod]

Attaching a patch that makes it work here.  That's what I meant.

behdad


On Tue, 31 Jan 2006, Patrick Lam wrote:

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

--behdad
http://behdad.org/

"Commandment Three says Do Not Kill, Amendment Two says Blood Will Spill"
	-- Dan Bern, "New American Language"
-------------- next part --------------
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 23:37:12 -0000
@@ -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
 
Index: fc-cache/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-cache/Makefile.am,v
retrieving revision 1.10.4.4
diff -u -p -r1.10.4.4 Makefile.am
--- fc-cache/Makefile.am	31 Jan 2006 07:30:23 -0000	1.10.4.4
+++ fc-cache/Makefile.am	31 Jan 2006 23:37:12 -0000
@@ -39,7 +39,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLA
 
 bin_PROGRAMS=fc-cache
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cache.sgml
 
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 
Index: fc-cat/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-cat/Attic/Makefile.am,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 Makefile.am
--- fc-cat/Makefile.am	9 Dec 2005 16:36:45 -0000	1.1.2.2
+++ fc-cat/Makefile.am	31 Jan 2006 23:37:12 -0000
@@ -33,7 +33,7 @@ INCLUDES=-I${top_srcdir} $(FREETYPE_CFLA
 
 bin_PROGRAMS=fc-cat
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cat.sgml
 
 fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 
Index: fc-list/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-list/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- fc-list/Makefile.am	7 Dec 2004 01:14:46 -0000	1.10
+++ fc-list/Makefile.am	31 Jan 2006 23:37:12 -0000
@@ -31,7 +31,7 @@ bin_PROGRAMS=fc-list
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-list.sgml
 
 fc_list_LDADD = ${top_builddir}/src/libfontconfig.la