pubkeyop.in: New script for doing stuff with public keys.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 66745ed8ea7ee10037f3dee69c54d835756dc31c..ca709209966a2474617a0c115ec49cfbe7005407 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,12 +49,16 @@ SUBSTVARS = \
        PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
        bindir="$(bindir)" sbindir="$(sbindir)" \
-       pkgconfdir="$(pkgconfdir)" \
+       sysconfdir="$(sysconfdir)" pkgconfdir="$(pkgconfdir)" \
        pkgstatedir="$(localstatedir)/lib/$(PACKAGE)" \
        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
@@ -97,9 +101,11 @@ keyfunc.sh: keyfunc.sh.in Makefile
                mv keyfunc.sh.new keyfunc.sh
 
 ## Commands.
-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.list-keepers
+dist_pkglib_SCRIPTS    += keys.list-recov
 dist_pkglib_SCRIPTS    += keys.new-keeper
 dist_pkglib_SCRIPTS    += keys.new-recov
 dist_pkglib_SCRIPTS    += keys.recover
@@ -110,7 +116,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
@@ -125,6 +131,7 @@ dist_pkglib_DATA    += ktype.seccure
 dist_profile_DATA      += profile.d/01seccure
 
 ## Commands.
+dist_pkglib_SCRIPTS    += cryptop.archive
 dist_pkglib_SCRIPTS    += cryptop.genkey
 dist_pkglib_SCRIPTS    += cryptop.list
 dist_pkglib_SCRIPTS    += cryptop.delkey
@@ -146,12 +153,44 @@ userv/distorted-keys: userv/distorted-keys.in Makefile
                        >userv/distorted-keys.new && \
                mv userv/distorted-keys.new userv/distorted-keys
 
+###--------------------------------------------------------------------------
+### Standalone operations on public keys.
+
+bin_SCRIPTS            += pubkeyop
+EXTRA_DIST             += pubkeyop.in
+CLEANFILES             += pubkeyop
+pubkeyop: pubkeyop.in Makefile
+       $(SUBST) $(srcdir)/pubkeyop.in $(SUBSTVARS) >pubkeyop.new && \
+               chmod +x pubkeyop.new && mv pubkeyop.new pubkeyop
+
+###--------------------------------------------------------------------------
+### Secure storage management.
+
+## Ephemeral filesystem construction.
+sbin_SCRIPTS           += mount-ephemeral
+EXTRA_DIST             += mount-ephemeral
+
+## Directory claiming service.
+noinst_DATA            += userv/claim-dir
+EXTRA_DIST             += userv/claim-dir.in
+CLEANFILES             += userv/claim-dir
+userv/claim-dir: userv/claim-dir.in Makefile
+       $(AM_V_at)mkdir -p userv/
+       $(SUBST) $(srcdir)/userv/claim-dir.in $(SUBSTVARS) \
+                       >userv/claim-dir.new && \
+               mv userv/claim-dir.new userv/claim-dir
+
+## Configuration file.
+EXTRA_DIST             += claim-dir.tab
+
 ###--------------------------------------------------------------------------
 ### Configuration snippets.
 
 dist_profile_DATA      += profile.d/00base
 dist_profile_DATA      += profile.d/02infra
 
+EXTRA_DIST             += keys.conf
+
 ###--------------------------------------------------------------------------
 ### Release setup.
 
@@ -160,4 +199,17 @@ dist-hook::
 
 EXTRA_DIST             += config/auto-version
 
+###--------------------------------------------------------------------------
+### Debian packaging.
+
+EXTRA_DIST             += debian/changelog debian/control debian/copyright
+EXTRA_DIST             += debian/rules debian/compat
+
+EXTRA_DIST             += debian/distorted-keys.install
+EXTRA_DIST             += debian/distorted-keys.postinst
+
+EXTRA_DIST             += debian/claim-dir.install
+
+EXTRA_DIST             += debian/admin.users debian/admin.groups
+
 ###----- That's all, folks --------------------------------------------------