From d098e4ebe7e3b87a66ddbe09bafe3582373a022c Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 11 Dec 2003 19:30:07 +0000
Subject: [PATCH] Move man_MANS into the 'if USEDOCBOOK' block. Move man_MANS
 into the 'if USEDOCBOOK' block. (all-local): Remove excessive     whitespace.
 Add 'set -e' to abort when any program fails, (avoids printing of 'now type  
   make' after configure aborts).

---
 ChangeLog            | 12 ++++++++++++
 autogen.sh           |  2 ++
 fc-cache/Makefile.am |  6 +++---
 fc-list/Makefile.am  |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 545f758..ca1455d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-12-11  Carl Worth  <cworth@east.isi.edu>
+
+	* fc-list/Makefile.am (man_MANS): Move man_MANS into the 'if
+	USEDOCBOOK' block.
+
+	* fc-cache/Makefile.am (man_MANS): Move man_MANS into the 'if
+	USEDOCBOOK' block.
+	(all-local): Remove excessive whitespace.
+
+	* autogen.sh: Add 'set -e' to abort when any program fails,
+	(avoids printing of 'now type make' after configure aborts).
+
 2003-11-17   Eric Christopherson  <rakko@charter.net>
 
 	reviewed by: Keith Packard  <keithp@keithp.com>
diff --git a/autogen.sh b/autogen.sh
index 9eb6780..1a25aa8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+set -e
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 0d7fb30..1b4c845 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -29,8 +29,6 @@ SGML = ${FC_CACHE_SRC}/fc-cache.sgml
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
-man_MANS=fc-cache.1
-
 bin_PROGRAMS=fc-cache
 
 EXTRA_DIST=$(SGML)
@@ -38,7 +36,9 @@ EXTRA_DIST=$(SGML)
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
-                                                                                
+
+man_MANS=fc-cache.1
+
 ${man_MANS}: ${SGML}										
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index 1af8384..427ab18 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -29,8 +29,6 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
 
 bin_PROGRAMS=fc-list
 
-man_MANS=fc-list.1
-
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 EXTRA_DIST=$(SGML)
@@ -40,6 +38,8 @@ fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
+man_MANS=fc-list.1
+
 ${man_MANS}: ${SGML}
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
-- 
2.39.2