profile.d/00base: Make `%FOO-secrecy' include the right base sections.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2898615ac0b504ca5b1b7f26c748070c5b733f22..2a33276c242df2c0f9bb3acab081a4a554ab60bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,11 @@ SUBSTVARS = \
        pkglibdir="$(pkglibdir)" \
        user="$(user)"
 
-SUBST = $(AM_V_GEN)$(confsubst)
+V_SUBST = $(V_SUBST_$V)
+V_SUBST_= $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @printf "  SUBST  %s\n" $@;
+
+SUBST = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Utility programs.
@@ -81,7 +85,7 @@ extract-profile: extract-profile.in Makefile
 ### Main driver program and commands.
 
 ## Main driver.
-bin_SCRIPTS            += keys
+sbin_SCRIPTS           += keys
 EXTRA_DIST             += keys.in
 CLEANFILES             += keys
 keys: keys.in Makefile
@@ -111,7 +115,7 @@ dist_pkglib_SCRIPTS += keys.stash
 ### Crypto operations.
 
 ## Main driver program.
-sbin_SCRIPTS           += cryptop
+bin_SCRIPTS            += cryptop
 EXTRA_DIST             += cryptop.in
 CLEANFILES             += cryptop
 cryptop: cryptop.in Makefile
@@ -170,4 +174,6 @@ EXTRA_DIST          += debian/rules debian/compat
 EXTRA_DIST             += debian/distorted-keys.install
 EXTRA_DIST             += debian/distorted-keys.postinst
 
+EXTRA_DIST             += debian/admin.users debian/admin.groups
+
 ###----- That's all, folks --------------------------------------------------