diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-25 14:52:57 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-25 14:52:57 -0700 |
| commit | f40bbed9f92dfd86168facdb874663aa0de63395 (patch) | |
| tree | dc82d5b3f25493895a5498e66cb7375410e0c319 | |
| parent | 570e2ff8736bbc977085c5b3e47d159d4dffd90b (diff) | |
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | man/general/Makefile.am | 2 | ||||
| -rw-r--r-- | sgmlrules.in | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 71f68f8..9371ff9 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,11 @@ AC_PREREQ([2.57]) AC_INIT([xorg-docs], [1.4.99.902], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS DEFAULT_X11DOCDIR=${datadir}/X11/doc AC_ARG_WITH(x11docdir, @@ -49,15 +51,11 @@ AC_ARG_ENABLE(html, AS_HELP_STRING([--enable-html], [Build HTML versions of documents (default: disabled)]), [BUILD_HTMLDOC=$enableval], [BUILD_HTMLDOC=no]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AM_CONDITIONAL(BUILD_TXTDOC, test "x$BUILD_TXTDOC" = xyes) AM_CONDITIONAL(BUILD_PDFDOC, test "x$BUILD_PDFDOC" = xyes) AM_CONDITIONAL(BUILD_PSDOC, test "x$BUILD_PSDOC" = xyes) AM_CONDITIONAL(BUILD_HTMLDOC, test "x$BUILD_HTMLDOC" = xyes) XORG_CHECK_DOCBOOK -XORG_CHANGELOG AC_OUTPUT([Makefile man/Makefile diff --git a/man/general/Makefile.am b/man/general/Makefile.am index 462e64c..ebdd71d 100644 --- a/man/general/Makefile.am +++ b/man/general/Makefile.am @@ -53,6 +53,6 @@ MAN_SUBSTS = \ SUFFIXES = .$(MISC_MAN_SUFFIX) .man .man.$(MISC_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = $(miscman_PRE) diff --git a/sgmlrules.in b/sgmlrules.in index ca9c53f..def4aa9 100644 --- a/sgmlrules.in +++ b/sgmlrules.in @@ -32,28 +32,28 @@ if BUILD_TXTDOC INSTALL_FILES += $(TXT_FILES) .sgml.txt: @rm -f $@ - $(MAKE_TEXT) $< + $(AM_V_GEN)$(MAKE_TEXT) $< endif if BUILD_PDFDOC INSTALL_FILES += $(PDF_FILES) .sgml.pdf: @rm -f $@ - $(MAKE_PDF) $< + $(AM_V_GEN)$(MAKE_PDF) $< endif if BUILD_PSDOC INSTALL_FILES += $(PS_FILES) .sgml.ps: @rm -f $@ - $(MAKE_PS) $< + $(AM_V_GEN)$(MAKE_PS) $< endif if BUILD_HTMLDOC INSTALL_FILES += $(HTML_FILES) .sgml.html: @rm -f $@ - $(MAKE_HTML) -u $< + $(AM_V_GEN)$(MAKE_HTML) -u $< endif # x11docdir is expected to be defined by the including file. |