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 275bca1dae55eebb7b499657a8165d2c579db6ef..15b2d098f060393b45f1f1bfbeffe6442ed0ce51 100644 (file)
--- 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 923199554a9e92ac676780caa6809ce803350d32..530e82f2064358f29256f0dd18a16ae6b24df377 100644 (file)
--- 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 3a0ddfad93ea3c0e3fbc5c5df0f3edab30d8056e..c15ea2efdf13a283dd952748a54ddf84a12f35f9 100644 (file)
--- 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