keys.archive: New program to capture and sign an archive.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0cd0854cf089bbc0ab7269e942b37dbd09f7c3a6..ba7fdff69c2ee7610f6d0da517d850f9bce11700 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ bin_SCRIPTS            =
 sbin_SCRIPTS            =
 dist_pkglib_SCRIPTS     =
 dist_pkglib_DATA        =
+noinst_DATA             =
 pkglib_DATA             =
 noinst_SCRIPTS          =
 
@@ -43,10 +44,11 @@ EXTRA_DIST          += config/confsubst
 SUBSTVARS = \
         PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
-       bindir="$(bindir)" \
+       bindir="$(bindir)" sbindir="$(sbindir)" \
        pkgconfdir="$(sysconfdir)/$(PACKAGE)" \
        pkgstatedir="$(localstatedir)/$(PACKAGE)" \
-       pkglibdir="$(pkglibdir)"
+       pkglibdir="$(pkglibdir)" \
+       user="$(user)"
 
 SUBST = $(AM_V_GEN)$(confsubst)
 
@@ -71,32 +73,6 @@ extract-profile: extract-profile.in Makefile
                chmod +x extract-profile.new && \
                mv extract-profile.new extract-profile
 
-###--------------------------------------------------------------------------
-### Crypto operations.
-
-## Main driver program.
-sbin_SCRIPTS           += cryptop
-EXTRA_DIST             += cryptop.in
-CLEANFILES             += cryptop
-cryptop: cryptop.in Makefile
-       $(SUBST) $(srcdir)/cryptop.in $(SUBSTVARS) >cryptop.new && \
-               chmod +x cryptop.new && mv cryptop.new cryptop
-
-## Key type libraries.
-dist_pkglib_DATA       += ktype.gnupg
-dist_pkglib_DATA       += ktype.seccure
-
-## Commands.
-dist_pkglib_SCRIPTS    += cryptop.genkey
-dist_pkglib_SCRIPTS    += cryptop.delkey
-dist_pkglib_SCRIPTS    += cryptop.recover
-dist_pkglib_SCRIPTS    += cryptop.info
-dist_pkglib_SCRIPTS    += cryptop.public
-dist_pkglib_SCRIPTS    += cryptop.encrypt
-dist_pkglib_SCRIPTS    += cryptop.decrypt
-dist_pkglib_SCRIPTS    += cryptop.sign
-dist_pkglib_SCRIPTS    += cryptop.verify
-
 ###--------------------------------------------------------------------------
 ### Main driver program and commands.
 
@@ -117,6 +93,7 @@ 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.new-keeper
@@ -125,4 +102,39 @@ dist_pkglib_SCRIPTS        += keys.recover
 dist_pkglib_SCRIPTS    += keys.reveal
 dist_pkglib_SCRIPTS    += keys.stash
 
+###--------------------------------------------------------------------------
+### Crypto operations.
+
+## Main driver program.
+sbin_SCRIPTS           += cryptop
+EXTRA_DIST             += cryptop.in
+CLEANFILES             += cryptop
+cryptop: cryptop.in Makefile
+       $(SUBST) $(srcdir)/cryptop.in $(SUBSTVARS) >cryptop.new && \
+               chmod +x cryptop.new && mv cryptop.new cryptop
+
+## Key type libraries.
+dist_pkglib_DATA       += ktype.gnupg
+dist_pkglib_DATA       += ktype.seccure
+
+## Commands.
+dist_pkglib_SCRIPTS    += cryptop.genkey
+dist_pkglib_SCRIPTS    += cryptop.delkey
+dist_pkglib_SCRIPTS    += cryptop.recover
+dist_pkglib_SCRIPTS    += cryptop.info
+dist_pkglib_SCRIPTS    += cryptop.public
+dist_pkglib_SCRIPTS    += cryptop.encrypt
+dist_pkglib_SCRIPTS    += cryptop.decrypt
+dist_pkglib_SCRIPTS    += cryptop.sign
+dist_pkglib_SCRIPTS    += cryptop.verify
+
+## Userv services configuration.
+noinst_DATA            += distorted-keys.userv
+EXTRA_DIST             += distorted-keys.userv.in
+CLEANFILES             += distorted-keys.userv
+distorted-keys.userv: distorted-keys.userv.in Makefile
+       $(SUBST) $(srcdir)/distorted-keys.userv.in $(SUBSTVARS) \
+                       >distorted-keys.userv.new && \
+               mv distorted-keys.userv.new distorted-keys.userv
+
 ###----- That's all, folks --------------------------------------------------