From 213078f7b6e663cde09cb8e2e428870edff6fffc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
Date: Thu, 22 Jul 2021 16:55:08 -0700
Subject: [PATCH] Fixing up install targets for man pages and file permissions
 of secrets files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---
 Makefile.am                    | 5 ++++-
 contrib/pppgetpass/Makefile.am | 2 +-
 pppd/Makefile.am               | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 275bca1..15b2d09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,11 @@ install-am:
 	(cd solaris ; $(MAKE) -f Makefile install)
 endif
 
-sampledir = $(sysconfdir)/$(PACKAGE)
+install-data-hook:
+	(cd $(DESTDIR)/$(sysconfdir)/$(PACKAGE) ; \
+	 chmod 600 chap-secrets pap-secrets eaptls-server eaptls-client)
 
+sampledir = $(sysconfdir)/$(PACKAGE)
 sample_DATA = \
     etc.ppp/options \
     etc.ppp/chap-secrets \
diff --git a/contrib/pppgetpass/Makefile.am b/contrib/pppgetpass/Makefile.am
index 9231995..530e82f 100644
--- a/contrib/pppgetpass/Makefile.am
+++ b/contrib/pppgetpass/Makefile.am
@@ -1,5 +1,5 @@
 noinst_PROGRAMS = pppgetpass.vt
-dist_man8_MANS = pppgetpass.8
+noinst_man8_MANS = pppgetpass.8
 
 pppgetpass_vt_SOURCES = pppgetpass.vt.c
 pppgetpass_vt_CPPFLAGS = -Wno-unused-result
diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 3a0ddfa..c15ea2e 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -1,7 +1,8 @@
 sbin_PROGRAMS = pppd
-dist_man8_MANS = pppd.8 srp-entry.8
+dist_man8_MANS = pppd.8
 if WITH_SRP
 sbin_PROGRAMS += srp-entry
+dist_man8_MANS += srp-entry.8
 endif
 
 pkgconfigdir   = $(libdir)/pkgconfig
-- 
2.39.2