From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 11 Apr 2006 05:08:26 +0000 (+0000)
Subject: Survive missing docbook2pdf.
X-Git-Tag: fc-2_3_95~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af2ad236f037c7a53e73b9454f620de1a52f0422;p=platform%2Fupstream%2Ffontconfig.git

Survive missing docbook2pdf.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index badffff..145ddee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
-2006-04-07  Patrick Lam  <plam@mit.edu>
+2006-04-11  Behdad Esfahbod  <behdad@cs.toronto.edu>
+	reviewed by: plam
+
+	* doc/Makefile.am:
+
+	Survive missing docbook2pdf.
+
+2006-04-10  Patrick Lam  <plam@mit.edu>
 	* fc-case/fc-case.c:
 	* fc-glyphname/fc-glyphname.c:
 	* fc-lang/fc-lang.c:
 
 	Include more stub definitions to make HP-UX's C compiler happy.
 
-2006-04-07  Patrick Lam  <plam@mit.edu>
+2006-04-10  Patrick Lam  <plam@mit.edu>
 	* src/fcname.c (FcObjectUnserialize):
 
 	Swap typo in order of ALIGN and dereferencing, fixing bug 6529.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 10450b1..3477eb7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -142,8 +142,9 @@ fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml
 
 fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) $@
-	$(DOC2PDF) local-fontconfig-devel.sgml
-	mv local-fontconfig-devel.pdf $@
+	../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+	|| echo Failed to generate $@ >&2; \
+	(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
 fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@ local-$@ $@.tmp
@@ -159,8 +160,9 @@ fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
 
 fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@
-	$(DOC2PDF) local-fontconfig-user.sgml
-	mv local-fontconfig-user.pdf $@
+	../missing --run $(DOC2PDF) $< && mv local-$@ $@ \
+	|| echo Failed to generate $@ >&2; \
+	(test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@)
 
 STRIPNL=awk '{ if (NR > 1) printf ("\n"); printf ("%s", $$0); }'
 confdir.sgml: ${DOC_SRC}/confdir.sgml.in