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

diff --git a/ChangeLog b/ChangeLog
index 545f75825f5e77502b958909979ef5fe7e99e378..ca1455d2f528b6ca768bce51449b6fda4c97e466 100644 (file)
--- 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 9eb6780a9d4fc8ceea9e8fa71c80d9318be06c55..1a25aa8c7b032c58268f2b5dedc535b9cd2c4d2f 100755 (executable)
--- 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 0d7fb3043354a61600cd9f4d992abcea548b5012..1b4c845836d9876ec8f1edb21074b504f0678de7 100644 (file)
--- 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 1af8384c5e9fb233245df0861b00971a9a558989..427ab1883b5d2576905ee63e0e0ece16028462cb 100644 (file)
--- 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}