Fixes for ‘make dist’

* Makefile.am (EXTRA_DIST): Add DISTFILES and their
contents that aren’t covered by other makefiles.
(dist-hook): There is no make-ChangeLog, so make ChangeLog.
* paxlib/Makefile.am (EXTRA_DIST):
* rmt/Makefile.am (EXTRA_DIST): Add DISTFILES.

3 files changed, 32 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index ee0d730..b9e27b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # This file is part of GNU paxutils
 #
-# Copyright (c) 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (c) 2005-2022 Free Software Foundation, Inc.
 #
 # Written by Sergey Poznyakoff
 #
@@ -21,7 +21,12 @@
 
 ACLOCAL_AMFLAGS = -I am -I m4
 
-EXTRA_DIST = Make.rules
+EXTRA_DIST = \
+  DISTFILES Make.rules \
+  am/DISTFILES \
+  doc/DISTFILES doc/genfile.texi doc/rmt.8 \
+  lib/DISTFILES lib/rmt.h lib/rtapelib.c lib/system.h lib/system-ioctl.h \
+  tests/DISTFILES tests/genfile.c tests/argcv.c tests/argcv.h
 
 SUBDIRS = gnu paxlib paxtest rmt po
 
@@ -31,5 +36,4 @@ changelog_dir = .
 include Make.rules
 
 dist-hook:
-	$(MAKE) changelog_dir=$(distdir) make-ChangeLog
-
+	$(MAKE) changelog_dir=$(distdir) ChangeLog
diff --git a/paxlib/Makefile.am b/paxlib/Makefile.am
index 6d28ffa..5763f93 100644
--- a/paxlib/Makefile.am
+++ b/paxlib/Makefile.am
@@ -1,6 +1,6 @@
 # This file is part of GNU paxutils
 #
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2022 Free Software Foundation, Inc.
 #
 # Written by Sergey Poznyakoff
 #
@@ -34,6 +34,8 @@ libpax_a_SOURCES = \
  tarbuf.c\
  rtape.c
 
+EXTRA_DIST = DISTFILES
+
 BUILT_SOURCES=localedir.h
 localedir = $(datadir)/locale
 
diff --git a/rmt/Makefile.am b/rmt/Makefile.am
index 950b3c8..0db2a63 100644
--- a/rmt/Makefile.am
+++ b/rmt/Makefile.am
@@ -1,9 +1,30 @@
+# Make GNU rmt.
+
+# Copyright 2022 Free Software Foundation, Inc.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
 rmtdir=$(DEFAULT_RMT_DIR)
 rmt_PROGRAMS = @PU_RMT_PROG@
 EXTRA_PROGRAMS = rmt
 
 rmt_SOURCES = rmt.c
 
+EXTRA_DIST = DISTFILES
+
 AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib \
   -I$(top_srcdir)/paxlib