X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/f012ad83100add4822bfa4e7017673beae6ebf17..21a21fffb6e2d0cbddec155916a8257bb52d4d0d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 136d768..2a33276 100644
--- 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
@@ -100,6 +104,7 @@ keyfunc.sh: keyfunc.sh.in Makefile
 dist_pkglib_SCRIPTS	+= keys.archive
 dist_pkglib_SCRIPTS	+= keys.conceal
 dist_pkglib_SCRIPTS	+= keys.keeper-cards
+dist_pkglib_SCRIPTS	+= keys.keeper-nub
 dist_pkglib_SCRIPTS	+= keys.new-keeper
 dist_pkglib_SCRIPTS	+= keys.new-recov
 dist_pkglib_SCRIPTS	+= keys.recover
@@ -110,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
@@ -169,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 --------------------------------------------------