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

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c733758aba52f4b6e35dadea094ffe9874e6aa68..2a33276c242df2c0f9bb3acab081a4a554ab60bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,9 @@
 ### along with distorted-keys; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+pkgconfdir              = $(sysconfdir)/$(PACKAGE)
+profiledir              = $(pkgconfdir)/profile.d
+
 bin_SCRIPTS             =
 sbin_SCRIPTS            =
 dist_pkglib_SCRIPTS     =
@@ -30,6 +33,7 @@ dist_pkglib_DATA       =
 noinst_DATA             =
 pkglib_DATA             =
 noinst_SCRIPTS          =
+dist_profile_DATA       =
 
 EXTRA_DIST              =
 CLEANFILES              =
@@ -45,12 +49,16 @@ SUBSTVARS = \
        PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
        bindir="$(bindir)" sbindir="$(sbindir)" \
-       pkgconfdir="$(sysconfdir)/$(PACKAGE)" \
-       pkgstatedir="$(localstatedir)/$(PACKAGE)" \
+       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.
@@ -77,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
@@ -96,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
@@ -106,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
@@ -115,7 +124,10 @@ cryptop: cryptop.in Makefile
 
 ## Key type libraries.
 dist_pkglib_DATA       += ktype.gnupg
+dist_profile_DATA      += profile.d/01gnupg
+
 dist_pkglib_DATA       += ktype.seccure
+dist_profile_DATA      += profile.d/01seccure
 
 ## Commands.
 dist_pkglib_SCRIPTS    += cryptop.genkey
@@ -130,12 +142,38 @@ 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
+
+###--------------------------------------------------------------------------
+### Configuration snippets.
+
+dist_profile_DATA      += profile.d/00base
+dist_profile_DATA      += profile.d/02infra
+
+###--------------------------------------------------------------------------
+### Release setup.
+
+dist-hook::
+       echo $(VERSION) >$(distdir)/RELEASE
+
+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/admin.users debian/admin.groups
 
 ###----- That's all, folks --------------------------------------------------