summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2009-09-21 23:06:17 +0200
committerPeter Simons <simons@cryp.to>2009-09-21 23:18:24 +0200
commit0514441522a78cb2f9d967afd484e7d227e3c576 (patch)
treee78c71b099ff6deff658daa7d7cd9bae80964fab
parenta569db55c3f0d08f8caa0328e69f61109e512201 (diff)
downloadautoconf-archive-0514441522a78cb2f9d967afd484e7d227e3c576.tar.gz
Drop generated HTML documentation from the release tarball. Our
documentation format of choice is Texinfo, from which all kinds of other formats, including HTML, can be derived.
-rw-r--r--Makefile.am14
-rw-r--r--configure.ac8
2 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 92d0c4e..9149d2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,12 @@
# Licensed under the terms of the GNU General Public License.
dist_pkgdata_DATA = AUTHORS COPYING README
-
aclocaldir = $(datadir)/aclocal
dist_aclocal_DATA = $(M4SOURCE)
+info_TEXINFOS = autoconf-archive.texi
+EXTRA_DIST = build-aux/git-version-gen build-aux/gitlog-to-changelog $(TEXIFILE)
-htmldir = $(pkgdatadir)/html
-dist_html_DATA = $(HTMLFILE)
-
-info_TEXINFOS = autoconf-archive.texi
-
-EXTRA_DIST = build-aux/git-version-gen build-aux/gitlog-to-changelog $(TEXIFILE)
-
-autoconf-archive.info: $(TEXIFILE)
+autoconf-archive.info: $(TEXIFILE)
# maintainer rules
@@ -27,7 +21,7 @@ maintainer-clean-local:
@rm -rf $(srcdir)/build-aux
@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 COPYING
+ @rm -f autoconf-archive-*.*.*.tar.* GNUmakefile
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
diff --git a/configure.ac b/configure.ac
index 9112d95..6cce46b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,6 @@ done
AC_SUBST([M4SOURCE])
AC_MSG_RESULT([done])
-AC_MSG_CHECKING([for available HTML documentation])
-HTMLFILE=""
-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