`$(txtdir)` -> `$(docdir)`

* All documentation directories should be a function of `$(docdir)`, and
  not `$(datadir)`, which is to be used for files that the program
  actually needs at runtime.
* Also amend the debian install rules, since documentation is now
  natively installed into `$(docdir)` == `usr/share/doc/graphviz`.

diff --git a/Makefile.am b/Makefile.am
index 628d4ee43a9bf50253e722f6889bae036bf8b68a..97a34d3a5fb46b34341db9d6b1592936801ee086 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 export TAR_OPTIONS = --owner=0 --group=0 --exclude=windows/dependencies/*/*
 
-txtdir = $(pkgdatadir)/doc
-
-txt = AUTHORS COPYING CHANGELOG.md NEWS cpl1.0.txt
 html =
 
-txt_DATA = $(txt)
+dist_doc_DATA = AUTHORS COPYING CHANGELOG.md NEWS cpl1.0.txt
 html_DATA = $(html)
 
 pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
@@ -32,7 +29,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 = $(txt) $(html) graphviz.spec \
+EXTRA_DIST = $(html) 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/debian/graphviz-doc.install b/debian/graphviz-doc.install
index 935c0eed907b4f595b7fc09ea7c463fcdcf9ab4c..b1b828084fd976db0f414dda3d3b84ef3ae14440 100644 (file)
--- a/debian/graphviz-doc.install
+++ b/debian/graphviz-doc.install
@@ -1,8 +1,2 @@
 usr/share/graphviz/graphs   usr/share/doc/graphviz/examples
 usr/share/graphviz/demo     usr/share/doc/graphviz/examples
-
-usr/share/graphviz/doc/AUTHORS               usr/share/doc/graphviz
-usr/share/graphviz/doc/CHANGELOG.md          usr/share/doc/graphviz
-usr/share/graphviz/doc/Dot.ref               usr/share/doc/graphviz
-usr/share/graphviz/doc/latex_suggestions.txt usr/share/doc/graphviz
-

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2ccbb4e340b7fcbe3d5bfac9881134705e366be9..f2cdc7f322afa475df89499c63d69dddf7999b6c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,16 +4,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
-txt = Dot.ref latex_suggestions.txt fontfaq.txt addingLayout.txt
 
 if WITH_SMYRNA
 pdf += smyrna/smyrna.pdf
 endif
 
-txtdir = $(pkgdatadir)/doc
-
 pdf_DATA = $(pdf)
 html_DATA = $(html)
-txt_DATA = $(txt)
+dist_doc_DATA = Dot.ref latex_suggestions.txt fontfaq.txt addingLayout.txt
 
-EXTRA_DIST = $(txt) $(pdf) $(html) schema/*.xml schema/*.xslt infosrc/*
+EXTRA_DIST = $(pdf) $(html) schema/*.xml schema/*.xslt infosrc/*