Let Autoconf set `$(htmldir)`

* The previous variable would not respect `--docdir` passed to configure.
  Autoconf sets `$(htmldir)` to `$(docdir)` by default and AC_SUBST()s
  this value.

diff --git a/Makefile.am b/Makefile.am
index 0acf4a564e925cd0209b7f39b24804dca69a331f..628d4ee43a9bf50253e722f6889bae036bf8b68a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
 export TAR_OPTIONS = --owner=0 --group=0 --exclude=windows/dependencies/*/*
 
 txtdir = $(pkgdatadir)/doc
-htmldir = $(pkgdatadir)/doc/html
 
 txt = AUTHORS COPYING CHANGELOG.md NEWS cpl1.0.txt
 html =

diff --git a/debian/graphviz-doc.install b/debian/graphviz-doc.install
index e49dfd45b511613a83c5c53944ccdc03c9481c01..935c0eed907b4f595b7fc09ea7c463fcdcf9ab4c 100644 (file)
--- a/debian/graphviz-doc.install
+++ b/debian/graphviz-doc.install
@@ -1,6 +1,5 @@
 usr/share/graphviz/graphs   usr/share/doc/graphviz/examples
 usr/share/graphviz/demo     usr/share/doc/graphviz/examples
-usr/share/graphviz/doc/html usr/share/doc/graphviz
 
 usr/share/graphviz/doc/AUTHORS               usr/share/doc/graphviz
 usr/share/graphviz/doc/CHANGELOG.md          usr/share/doc/graphviz

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb224e945571fd12ae87468535e528e3e6e722e6..2ccbb4e340b7fcbe3d5bfac9881134705e366be9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,6 @@ if WITH_SMYRNA
 pdf += smyrna/smyrna.pdf
 endif
 
-htmldir = $(pkgdatadir)/doc/html
 txtdir = $(pkgdatadir)/doc
 
 pdf_DATA = $(pdf)

diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am
index cd7a1c017938e31ed146c689c46f84954716e05c..be099d2e2b4335d7b2fab5062f7bf9e8725dd139 100644 (file)
--- a/doc/info/Makefile.am
+++ b/doc/info/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-htmldir = $(pkgdatadir)/doc/html/info
-dist_html_DATA = attrs.html colors.html command.html \
+htmlinfodir = $(htmldir)/info
+dist_htmlinfo_DATA = attrs.html colors.html command.html \
        index.html lang.html output.html shapes.html arrows.html

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 30aa2f85aae130b1a34ad46a210e7303dfc817f4..be37a9f93bc6c8579fd14c8653a9238952f522a3 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -9,8 +9,6 @@ if WITH_LIBGD
 GDTCLFT_LIBS = $(top_builddir)/tclpkg/gdtclft/libgdtclft_C.la
 endif
 
-htmldir = $(pkgdatadir)/doc/html
-
 pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \