diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-09 03:02:21 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-09 03:02:21 +0000 |
| commit | 26b41ff43959a07a778bc3d6e4db8da036f09de3 (patch) | |
| tree | a67959d26f2cfb66777a2c505afa2c19273aa153 | |
| parent | d6f98cbdb8fb74c504a92939d3741420eeed7110 (diff) | |
Fix sgml docs build.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | hw/dmx/doc/Makefile.am | 14 | ||||
| -rw-r--r-- | hw/xfree86/doc/sgml/Makefile.am | 14 |
4 files changed, 27 insertions, 17 deletions
@@ -1,6 +1,13 @@ 2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: + * hw/dmx/doc/Makefile.am: + * hw/xfree86/doc/sgml/Makefile.am: + Fix sgml docs build. + +2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: Add configure option to set the top level font dir. 2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> diff --git a/configure.ac b/configure.ac index c35281787..9cf9b276a 100644 --- a/configure.ac +++ b/configure.ac @@ -449,11 +449,10 @@ fi dnl Handle building documentation AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes) -if test "x$BUILDDOCS" = xyes; then - dnl Only build sgml docs when linuxdoc is available - AC_PATH_PROG(LINUXDOC, linuxdoc) -fi -AM_CONDITIONAL(BUILDSGMLDOCS, test "x$LINUXDOC" != x) + +dnl Only build sgml docs when linuxdoc is available and +dnl def.ents has been installed +XORG_CHECK_LINUXDOC dnl Handle installing libxf86config AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes]) diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am index 888306cfe..08a60b811 100644 --- a/hw/dmx/doc/Makefile.am +++ b/hw/dmx/doc/Makefile.am @@ -21,29 +21,31 @@ SGML_FILES = dmx.sgml scaled.sgml +if BUILD_LINUXDOC TXT_FILES = $(SGML_FILES:%.sgml=%.txt) PS_FILES = $(SGML_FILES:%.sgml=%.ps) +if BUILD_PDFDOC PDF_FILES = $(SGML_FILES:%.sgml=%.pdf) +endif HTML_FILES = $(SGML_FILES:%.sgml=%.html) SUFFIXES = .sgml .txt .html .ps .pdf -if BUILDSGMLDOCS .sgml.txt: @rm -f $@ - GROFF_NO_SGR= $(LINUXDOC) -B txt $^ + $(MAKE_TEXT) $< .sgml.ps: @rm -f $@ - $(LINUXDOC) -B latex --papersize=letter --output=ps $^ + $(MAKE_PS) $< -.sgml.pdf: +.ps.pdf: @rm -f $@ - $(LINUXDOC) -B latex --papersize=letter --output=pdf $^ + $(MAKE_PDF) $< .sgml.html: @rm -f $@ - $(LINUXDOC) -B html --split=0 $^ + $(MAKE_HTML) $< noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) diff --git a/hw/xfree86/doc/sgml/Makefile.am b/hw/xfree86/doc/sgml/Makefile.am index 524306b6c..d2c821c03 100644 --- a/hw/xfree86/doc/sgml/Makefile.am +++ b/hw/xfree86/doc/sgml/Makefile.am @@ -21,29 +21,31 @@ SGML_FILES = DESIGN.sgml +if BUILD_LINUXDOC TXT_FILES = $(SGML_FILES:%.sgml=%.txt) PS_FILES = $(SGML_FILES:%.sgml=%.ps) +if BUILD_PDFDOC PDF_FILES = $(SGML_FILES:%.sgml=%.pdf) +endif HTML_FILES = $(SGML_FILES:%.sgml=%.html) SUFFIXES = .sgml .txt .html .ps .pdf -if BUILDSGMLDOCS .sgml.txt: @rm -f $@ - GROFF_NO_SGR= $(LINUXDOC) -B txt $^ + $(MAKE_TEXT) $< .sgml.ps: @rm -f $@ - $(LINUXDOC) -B latex --papersize=letter --output=ps $^ + $(MAKE_PS) $< -.sgml.pdf: +.ps.pdf: @rm -f $@ - $(LINUXDOC) -B latex --papersize=letter --output=pdf $^ + $(MAKE_PDF) $< .sgml.html: @rm -f $@ - $(LINUXDOC) -B html --split=0 $^ + $(MAKE_HTML) $< noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) |