From b94608b25ad3946f15f4394240e15f34a50052df Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Mon, 27 Apr 2020 15:34:04 +0000
Subject: modules/*/Makefile.am: list secureconf_DATA files in EXTRA_DIST
 uniformly

The change was prepared using the following script:
  git grep -l secureconf_DATA modules/*/Makefile.am |while read m; do
    t="$(sed '/^secureconf_DATA = /!d;s///;q' -- "$m")"
    sed -i "/^EXTRA_DIST =/ s/\\<$t\\>/\$(secureconf_DATA)/" -- "$m"
  done

* modules/pam_access/Makefile.am (EXTRA_DIST): Replace access.conf with
$(secureconf_DATA).
* modules/pam_env/Makefile.am (EXTRA_DIST): Replace pam_env.conf with
$(secureconf_DATA).
* modules/pam_group/Makefile.am (EXTRA_DIST): Replace group.conf with
$(secureconf_DATA).
* modules/pam_limits/Makefile.am (EXTRA_DIST): Replace limits.conf with
$(secureconf_DATA).
* modules/pam_namespace/Makefile.am (EXTRA_DIST): Replace namespace.conf
with $(secureconf_DATA).
* modules/pam_sepermit/Makefile.am (EXTRA_DIST): Replace sepermit.conf
with $(secureconf_DATA).
* modules/pam_time/Makefile.am (EXTRA_DIST): Replace time.conf with
$(secureconf_DATA).
---
 modules/pam_access/Makefile.am    | 2 +-
 modules/pam_env/Makefile.am       | 2 +-
 modules/pam_group/Makefile.am     | 2 +-
 modules/pam_limits/Makefile.am    | 2 +-
 modules/pam_namespace/Makefile.am | 2 +-
 modules/pam_sepermit/Makefile.am  | 2 +-
 modules/pam_time/Makefile.am      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index 829f2eea..eff6457f 100644
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README access.conf $(MANS) $(XMLS) $(TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
 
 if HAVE_DOC
 man_MANS = access.conf.5 pam_access.8
diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index e148fdd9..c20e478d 100644
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) $(TESTS) environment
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA) environment
 
 if HAVE_DOC
 man_MANS = pam_env.conf.5 pam_env.8 environment.5
diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index 6595dffd..dc43cf01 100644
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README group.conf $(MANS) $(XMLS) $(TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
 
 if HAVE_DOC
 man_MANS = group.conf.5 pam_group.8
diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index f6181274..231b37bf 100644
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) limits.conf $(TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
 
 if HAVE_DOC
 man_MANS = limits.conf.5 pam_limits.8
diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
index ec62b1d3..995e5c94 100644
--- a/modules/pam_namespace/Makefile.am
+++ b/modules/pam_namespace/Makefile.am
@@ -10,7 +10,7 @@ if HAVE_DOC
 man_MANS = namespace.conf.5 pam_namespace.8 pam_namespace_helper.8
 endif
 
-EXTRA_DIST = README namespace.conf namespace.init $(MANS) $(XMLS) $(TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA) namespace.init
 
 TESTS = tst-pam_namespace
 
diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
index 68b87568..c382ebd8 100644
--- a/modules/pam_sepermit/Makefile.am
+++ b/modules/pam_sepermit/Makefile.am
@@ -6,7 +6,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) sepermit.conf
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
 
 TESTS = tst-pam_sepermit
 if HAVE_DOC
diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index b4581017..8db6645e 100644
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -5,7 +5,7 @@
 CLEANFILES = *~
 MAINTAINERCLEANFILES = $(MANS) README
 
-EXTRA_DIST = README $(MANS) $(XMLS) time.conf $(TESTS)
+EXTRA_DIST = README $(MANS) $(XMLS) $(TESTS) $(secureconf_DATA)
 
 if HAVE_DOC
 man_MANS = time.conf.5 pam_time.8
-- 
cgit v1.2.3