diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | doc/.gitignore | 10 | ||||
| -rw-r--r-- | doc/Makefile.am | 10 | ||||
| -rw-r--r-- | doc/autoconf-archive.texi (renamed from autoconf-archive.texi) | 0 |
7 files changed, 29 insertions, 17 deletions
@@ -17,15 +17,10 @@ /aclocal.m4 /autoconf-archive-*.*.*.tar.* /autoconf-archive-*.*.*/* -/autoconf-archive.info -/autoconf-archive.info-? /autom4te.cache/* /build-aux/* /config.log /config.status /configure -/doc/* /gnulib /maint.mk -/stamp-vti -/version.texi diff --git a/Makefile.am b/Makefile.am index a29c5e2..422013d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,15 +3,12 @@ # Copyright (c) 2009 by Peter Simons <simons@cryp.to> # Licensed under the terms of the GNU General Public License. +SUBDIRS = doc + dist_pkgdata_DATA = AUTHORS COPYING README aclocaldir = $(datadir)/aclocal dist_aclocal_DATA = $(M4SOURCE) -info_TEXINFOS = autoconf-archive.texi -MAKEINFOFLAGS = -I $(srcdir)/doc -am__TEXINFO_TEX_DIR = $(srcdir)/build-aux$(PATH_SEPARATOR)$(srcdir)/doc -EXTRA_DIST = build-aux/git-version-gen build-aux/gitlog-to-changelog $(TEXIFILE) - -autoconf-archive.info: $(TEXIFILE) +EXTRA_DIST = build-aux/git-version-gen build-aux/gitlog-to-changelog # maintainer rules @@ -21,7 +18,6 @@ clean-local: maintainer-clean-local: @rm -rf $(srcdir)/build-aux - @rm -rf doc @rm -f configure Makefile.in aclocal.m4 AUTHORS ChangeLog @rm -f INSTALL config.log config.status configure maint.mk @rm -f autoconf-archive-*.*.*.tar.* GNUmakefile @@ -23,7 +23,7 @@ TEXI_FILES := $(patsubst %,$(DOCDIR)/%.texi,$(MACROS)) .PHONY: generate ALL_RECURSIVE_TARGETS += generate -generate: $(HTML_FILES) $(TEXI_FILES) autoconf-archive.info +generate: $(HTML_FILES) $(TEXI_FILES) $(STAGEDIR)/manifest: @$(MKDIR_P) $(STAGEDIR) diff --git a/configure.ac b/configure.ac index 6cce46b..571c4a9 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([autoconf-archive.texi]) +AC_CONFIG_SRCDIR([doc/autoconf-archive.texi]) AC_COPYRIGHT([dnl Compilation Copyright 2001-2009 by Peter Simons <simons@cryp.to> @@ -29,13 +29,14 @@ AC_MSG_RESULT([done]) AC_MSG_CHECKING([for available Texinfo documentation]) TEXIFILE="" -for n in ${srcdir}/doc/*.texi ; do +(cd ${srcdir}/doc +for n in *.texi ; do TEXIFILE="${TEXIFILE} ${n}" -done +done) AC_SUBST([TEXIFILE]) AC_MSG_RESULT([done]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile doc/Makefile]) AC_OUTPUT dnl Responsibility shifts to the user after this point. diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..5044f64 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,10 @@ +# ignore generated files + +/Makefile +/Makefile.in +/all-macros.texi +/autoconf-archive.info +/autoconf-archive.info-? +/ax_*.texi +/stamp-vti +/version.texi diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..0045313 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,10 @@ +# Build and install the Autoconf Archive Documentation. +# +# Copyright (c) 2009 by Peter Simons <simons@cryp.to> +# Licensed under the terms of the GNU General Public License. + +info_TEXINFOS = autoconf-archive.texi +am__TEXINFO_TEX_DIR = $(srcdir)/build-aux$(PATH_SEPARATOR)$(srcdir)/doc +EXTRA_DIST = build-aux/git-version-gen build-aux/gitlog-to-changelog $(TEXIFILE) + +autoconf-archive.info: $(TEXIFILE) diff --git a/autoconf-archive.texi b/doc/autoconf-archive.texi index 8139c5a..8139c5a 100644 --- a/autoconf-archive.texi +++ b/doc/autoconf-archive.texi |