diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | autoconf-archive.texi | 4 | ||||
| -rw-r--r-- | cfg.mk | 21 | ||||
| -rw-r--r-- | configure.ac | 14 |
5 files changed, 29 insertions, 19 deletions
@@ -24,5 +24,8 @@ /config.log /config.status /configure +/doc/* /gnulib /maint.mk +/stamp-vti +/version.texi diff --git a/Makefile.am b/Makefile.am index ca7f018..7751cf0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,11 @@ dist_aclocal_DATA = $(M4SOURCE) htmldir = $(pkgdatadir)/html dist_html_DATA = $(HTMLFILE) -EXTRA_DIST = build-aux/git-version-gen +info_TEXINFOS = autoconf-archive.texi + +EXTRA_DIST = build-aux/git-version-gen $(TEXIFILE) + +autoconf-archive.info: $(TEXIFILE) # maintainer rules diff --git a/autoconf-archive.texi b/autoconf-archive.texi index 939eb62..1a7167c 100644 --- a/autoconf-archive.texi +++ b/autoconf-archive.texi @@ -7,7 +7,7 @@ @end ifclear @comment %**end of header -@include stage/version.texi +@include version.texi @copying This manual is for Autoconf Archive @value{VERSION}, @@ -581,6 +581,6 @@ General Public License for more details. * ax_xtra_classpath:: @end menu -@include stage/all-macros.texi +@include doc/all-macros.texi @bye @@ -14,11 +14,12 @@ TAR_OPTIONS += --mtime=$(today) M4DIR := $(srcdir)/m4 HTMLDIR := $(srcdir)/html STAGEDIR := $(srcdir)/stage +DOCDIR := $(srcdir)/doc M4_FILES := $(wildcard $(M4DIR)/*.m4) MACROS := $(patsubst $(M4DIR)/%.m4,%, $(M4_FILES)) HTML_FILES := $(patsubst %,$(HTMLDIR)/%.html,$(MACROS)) -TEXI_FILES := $(patsubst %,$(STAGEDIR)/%.texi,$(MACROS)) +TEXI_FILES := $(patsubst %,$(DOCDIR)/%.texi,$(MACROS)) .PHONY: generate ALL_RECURSIVE_TARGETS += generate @@ -38,24 +39,18 @@ $(STAGEDIR)/%.html : $(STAGEDIR)/%.m4 $(srcdir)/macro2html.py @echo generating $@ @$(srcdir)/macro2html.py "$<" "$@" -$(STAGEDIR)/%.texi : $(STAGEDIR)/%.m4 $(srcdir)/macro2texi.py +$(DOCDIR)/%.texi : $(STAGEDIR)/%.m4 $(srcdir)/macro2texi.py $(DOCDIR)/all-macros.texi @echo generating $@ @$(srcdir)/macro2texi.py "$<" "$@" -$(HTMLDIR)/%.html : $(STAGEDIR)/%.html - @echo pretty-printing $@ - @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes "$<" >"$@" - -$(STAGEDIR)/all-macros.texi: $(TEXI_FILES) - @$(MKDIR_P) $(STAGEDIR) +$(DOCDIR)/all-macros.texi: + @$(MKDIR_P) $(DOCDIR) @rm -f "$@" @for n in $(TEXI_FILES); do echo "@include $$n" >>"$@"; done -$(STAGEDIR)/autoconf-archive.info: $(srcdir)/autoconf-archive.texi $(STAGEDIR)/all-macros.texi $(STAGEDIR)/version.texi - makeinfo -o $@ $< - -$(STAGEDIR)/version.texi: - echo @set VERSION $(VERSION) >"$@" +$(HTMLDIR)/%.html : $(STAGEDIR)/%.html + @echo pretty-printing $@ + @tidy -quiet -ascii --indent yes --indent-spaces 1 --tidy-mark no -wrap 80 --hide-comments yes "$<" >"$@" taint-distcheck: diff --git a/configure.ac b/configure.ac index 0b43b7a..ebedc49 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl configure the Autoconf Archive AC_INIT([autoconf-archive], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [autoconf-archive-maintainers@nongnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall gnu dist-bzip2 dist-xz]) -AC_CONFIG_SRCDIR([m4/ax_have_epoll.m4]) +AC_CONFIG_SRCDIR([autoconf-archive.texi]) AC_COPYRIGHT([dnl Compilation Copyright 2009 by Peter Simons <simons@cryp.to> @@ -27,14 +27,22 @@ done AC_SUBST([M4SOURCE]) AC_MSG_RESULT([done]) -AC_MSG_CHECKING([for available documentation]) +AC_MSG_CHECKING([for available HTML documentation]) HTMLFILE="" -for n in ${srcdir}/html/*.* ; do +for n in ${srcdir}/html/*.html ${srcdir}/html/*.css ; do HTMLFILE="${HTMLFILE} ${n}" done AC_SUBST([HTMLFILE]) AC_MSG_RESULT([done]) +AC_MSG_CHECKING([for available Texinfo documentation]) +TEXIFILE="" +for n in ${srcdir}/doc/*.texi ; do + TEXIFILE="${TEXIFILE} ${n}" +done +AC_SUBST([TEXIFILE]) +AC_MSG_RESULT([done]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT |