From: David Seifert <soap@gentoo.org>
Date: Thu, 14 Apr 2022 08:23:49 +0000 (+0200)
Subject: Prefer `dist_` prefix over `EXTRA_DIST`
X-Git-Tag: 4.0.0~101^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bc6845af79d7add84e6ac65857200e9f112270e;p=graphviz

Prefer `dist_` prefix over `EXTRA_DIST`

* `dist_` expresses the clear intent for files to be distributed along in the tarball:
  https://www.gnu.org/software/automake/manual/html_node/Program-and-Library-Variables.html
---

diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am
index 1a20c21e5..cd7a1c017 100644
--- a/doc/info/Makefile.am
+++ b/doc/info/Makefile.am
@@ -1,8 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
 htmldir = $(pkgdatadir)/doc/html/info
-
-html_DATA = attrs.html colors.html command.html \
+dist_html_DATA = attrs.html colors.html command.html \
 	index.html lang.html output.html shapes.html arrows.html
-
-EXTRA_DIST = $(html_DATA)
diff --git a/doc/schema/Makefile.am b/doc/schema/Makefile.am
index 48c687598..42b979e3b 100644
--- a/doc/schema/Makefile.am
+++ b/doc/schema/Makefile.am
@@ -1,7 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
 schemadir = $(pkgdatadir)/doc/html/schema
-
-schema_DATA = arguments.xml attributes.xml attributes.xslt
-
-EXTRA_DIST = $(schema_DATA)
+dist_schema_DATA = arguments.xml attributes.xml attributes.xslt
diff --git a/tclpkg/gdtclft/demo/Makefile.am b/tclpkg/gdtclft/demo/Makefile.am
index c4efa0ece..9bd8c6885 100644
--- a/tclpkg/gdtclft/demo/Makefile.am
+++ b/tclpkg/gdtclft/demo/Makefile.am
@@ -3,8 +3,6 @@
 demodir = $(datadir)/$(PACKAGE)/demo
 
 if WITH_TCL
-demo_SCRIPTS = entities.tcl
-demo_DATA = entities.tcl.README entities.html
+dist_demo_SCRIPTS = entities.tcl
+dist_demo_DATA = entities.tcl.README entities.html
 endif
-
-EXTRA_DIST = entities.tcl entities.tcl.README entities.html
diff --git a/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am b/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
index 82e60176a..179f2182b 100644
--- a/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
+++ b/tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
@@ -1,12 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
-	obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
-
 pathplanexampledir = $(datadir)/$(PACKAGE)/demo/pathplan_data
 
 if WITH_TCL
-pathplanexample_DATA = $(EXAMPLES)
+dist_pathplanexample_DATA = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
+	obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
 endif
-
-EXTRA_DIST = $(EXAMPLES)