Move `html_DATA` -> `dist_html_DATA`

diff --git a/Makefile.am b/Makefile.am
index ad2ff49e46e60d0e42575fe811e6088b470ca119..0d6684c70a9b63e27fbf9de87dcb5218f80f9cb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 export TAR_OPTIONS = --owner=0 --group=0 --exclude=windows/dependencies/*/*
 
-html =
-
 dist_doc_DATA = AUTHORS COPYING CHANGELOG.md NEWS cpl1.0.txt
-html_DATA = $(html)
 
 pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
 
@@ -29,7 +26,7 @@ $(top_builddir)/graphviz_version.h: config.h
        printf '#pragma once\n' > $(top_builddir)/graphviz_version.h
        $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h >> $(top_builddir)/graphviz_version.h
 
-EXTRA_DIST = $(html) graphviz.spec \
+EXTRA_DIST = graphviz.spec \
        autogen.sh config/depcomp config/config.rpath \
        builddate.h \
        m4/README m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2cdc7f322afa475df89499c63d69dddf7999b6c..0860d85c6e16a2f34dfdeb9bbfb031d3c32b755f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,14 +3,13 @@
 SUBDIRS = info schema
 
 pdf = dotguide.pdf neatoguide.pdf libgraph/Agraph.pdf libguide/libguide.pdf
-html = build.html FAQ.html index.html winbuild.html pspdf.png char.html gdtclft.entities.example.png todo.html internal_todo.html
 
 if WITH_SMYRNA
 pdf += smyrna/smyrna.pdf
 endif
 
 pdf_DATA = $(pdf)
-html_DATA = $(html)
+dist_html_DATA = build.html FAQ.html index.html winbuild.html pspdf.png char.html gdtclft.entities.example.png todo.html internal_todo.html
 dist_doc_DATA = Dot.ref latex_suggestions.txt fontfaq.txt addingLayout.txt
 
-EXTRA_DIST = $(pdf) $(html) schema/*.xml schema/*.xslt infosrc/*
+EXTRA_DIST = $(pdf) schema/*.xml schema/*.xslt infosrc/*

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 98be9832e8df3dd4718e5baa4c1a5f103a039ed9..d6ff588b3b5a900bad8c5852fada88bea56461eb 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -24,7 +24,6 @@ LIBS = -lc $(TCL_STUB_LIB_SPEC)
 AM_CFLAGS = $(TCL_CFLAGS)
 
 man = tcldot.3tcl
-html = tcldot.html
 
 if WITH_TCL
 noinst_HEADERS = tcldot.h
@@ -34,7 +33,7 @@ man_MANS = $(man)
 if ENABLE_MAN_PDFS
 pdf_DATA = tcldot.3tcl.pdf
 endif
-html_DATA = $(html)
+dist_html_DATA = tcldot.html
 endif
 
 libtcldot_la_SOURCES = \
@@ -115,7 +114,7 @@ endif
        $(PS2PDF) $$psfile && rm -f $$psfile || { rm -f $$psfile; exit 1; }
 SUFFIXES = .3tcl .3tcl.pdf
 
-EXTRA_DIST = $(man) $(html) README README.Tkspline
+EXTRA_DIST = $(man) README README.Tkspline
 
 CLEANFILES = pkgIndex.tcl
 DISTCLEANFILES = $(pdf_DATA)