userv/distorted-keys.in: Rename from distorted-keys.userv.in.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3566e3a692c17d09d3fd1a09f594d3080e5470af..1fc452b038eacac867e10a0b2ffb667bf8467c45 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ confsubst = $(top_srcdir)/config/confsubst
 EXTRA_DIST             += config/confsubst
 
 SUBSTVARS = \
-        PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
+       PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
        bindir="$(bindir)" sbindir="$(sbindir)" \
        pkgconfdir="$(sysconfdir)/$(PACKAGE)" \
@@ -93,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
@@ -118,6 +119,7 @@ dist_pkglib_DATA    += ktype.seccure
 
 ## Commands.
 dist_pkglib_SCRIPTS    += cryptop.genkey
+dist_pkglib_SCRIPTS    += cryptop.list
 dist_pkglib_SCRIPTS    += cryptop.delkey
 dist_pkglib_SCRIPTS    += cryptop.recover
 dist_pkglib_SCRIPTS    += cryptop.info
@@ -128,12 +130,13 @@ 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
+noinst_DATA            += userv/distorted-keys
+EXTRA_DIST             += userv/distorted-keys.in
+CLEANFILES             += userv/distorted-keys
+userv/distorted-keys: userv/distorted-keys.in Makefile
+       $(AM_V_at)mkdir -p userv/
+       $(SUBST) $(srcdir)/userv/distorted-keys.in $(SUBSTVARS) \
+                       >userv/distorted-keys.new && \
+               mv userv/distorted-keys.new userv/distorted-keys
 
 ###----- That's all, folks --------------------------------------------------