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).
This commit is contained in:
Carl Worth 2003-12-11 19:30:07 +00:00
parent 408dd9c07a
commit d098e4ebe7
4 changed files with 19 additions and 5 deletions

View File

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

View File

@ -1,6 +1,8 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
set -e
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.

View File

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

View File

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