From: Eivind Næss <eivnaes@yahoo.com>
Date: Thu, 22 Jul 2021 23:55:08 +0000 (-0700)
Subject: Fixing up install targets for man pages and file permissions of secrets files
X-Git-Tag: ppp-2.5.0~66^2
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=213078f7b6e663cde09cb8e2e428870edff6fffc;p=ppp.git

Fixing up install targets for man pages and file permissions of secrets files

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

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