X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/4c8c406559cd6b201004955a3db7cb3386a0f00d..ec3628d8dbd4d112033b4ca79c296ad570222a22:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1d362c8..48251c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,10 +30,12 @@ bin_SCRIPTS		 =
 sbin_SCRIPTS		 =
 dist_pkglib_SCRIPTS	 =
 dist_pkglib_DATA	 =
-noinst_DATA		 =
 pkglib_DATA		 =
-noinst_SCRIPTS		 =
 dist_profile_DATA	 =
+noinst_DATA		 =
+USERV_CONFIG		 =
+KEYS_CONFIG		 =
+TOPLEVEL_CONFIG		 =
 
 EXTRA_DIST		 =
 CLEANFILES		 =
@@ -49,12 +51,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.
@@ -97,16 +103,32 @@ 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.delete-keeper
 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
 dist_pkglib_SCRIPTS	+= keys.reveal
 dist_pkglib_SCRIPTS	+= keys.stash
 
+## Common profiles.
+dist_profile_DATA	+= profile.d/00base
+dist_profile_DATA	+= profile.d/02infra
+
+## Other configuration.
+KEYS_CONFIG		+= keys.conf
+EXTRA_DIST		+= keys.conf
+
+KEYS_CONFIG		+= admin.users admin.groups
+EXTRA_DIST		+= admin.users admin.groups
+
+KEYS_CONFIG		+= keeper-cards.tex
+EXTRA_DIST		+= keeper-cards.tex
+
 ###--------------------------------------------------------------------------
 ### Crypto operations.
 
@@ -126,6 +148,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
@@ -138,7 +161,7 @@ dist_pkglib_SCRIPTS	+= cryptop.sign
 dist_pkglib_SCRIPTS	+= cryptop.verify
 
 ## Userv services configuration.
-noinst_DATA		+= userv/distorted-keys
+USERV_CONFIG		+= userv/distorted-keys
 EXTRA_DIST		+= userv/distorted-keys.in
 CLEANFILES		+= userv/distorted-keys
 userv/distorted-keys: userv/distorted-keys.in Makefile
@@ -148,10 +171,92 @@ userv/distorted-keys: userv/distorted-keys.in Makefile
 		mv userv/distorted-keys.new userv/distorted-keys
 
 ###--------------------------------------------------------------------------
-### Configuration snippets.
+### Standalone operations on public keys.
 
-dist_profile_DATA	+= profile.d/00base
-dist_profile_DATA	+= profile.d/02infra
+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.
+USERV_CONFIG		+= 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.
+TOPLEVEL_CONFIG		+= claim-dir.tab
+EXTRA_DIST		+= claim-dir.tab
+
+###--------------------------------------------------------------------------
+### Installing configuration.
+
+## Install userv configuration.
+noinst_DATA		+= $(USERV_CONFIG)
+install-data-local::
+	$(MKDIR_P) $(DESTDIR)$(uservconfdir)
+	@for i in $(USERV_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  if [ -f $(DESTDIR)$(uservconfdir)/$$b ]; then continue; fi; \
+	  if [ -f $$i ]; then s=$$i; else s=$(srcdir)/$$i; fi; \
+	  echo $(INSTALL_DATA) $$s $(DESTDIR)$(uservconfdir); \
+	  $(INSTALL_DATA) $$s $(DESTDIR)$(uservconfdir) || exit 1; \
+	done
+uninstall-local::
+	@for i in $(USERV_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  echo rm -f $(DESTDIR)$(uservconfdir)/$$b; \
+	  rm -f $(DESTDIR)$(uservconfdir)/$$b; \
+	done
+
+## Install keys configuration.
+noinst_DATA		+= $(KEYS_CONFIG)
+install-data-local::
+	$(MKDIR_P) $(DESTDIR)$(pkgconfdir)
+	@for i in $(KEYS_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  if [ -f $(DESTDIR)$(pkgconfdir)/$$b ]; then continue; fi; \
+	  if [ -f $$i ]; then s=$$i; else s=$(srcdir)/$$i; fi; \
+	  echo $(INSTALL_DATA) $$s $(DESTDIR)$(pkgconfdir); \
+	  $(INSTALL_DATA) $$s $(DESTDIR)$(pkgconfdir) || exit 1; \
+	done
+uninstall-local::
+	@for i in $(KEYS_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  echo rm -f $(DESTDIR)$(pkgconfdir)/$$b; \
+	  rm -f $(DESTDIR)$(pkgconfdir)/$$b; \
+	done
+
+## Install toplevel configuration.
+noinst_DATA		+= $(TOPLEVEL_CONFIG)
+install-data-local::
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+	@for i in $(TOPLEVEL_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  if [ -f $(DESTDIR)$(sysconfdir)/$$b ]; then continue; fi; \
+	  if [ -f $$i ]; then s=$$i; else s=$(srcdir)/$$i; fi; \
+	  echo $(INSTALL_DATA) $$s $(DESTDIR)$(sysconfdir); \
+	  $(INSTALL_DATA) $$s $(DESTDIR)$(sysconfdir) || exit 1; \
+	done
+uninstall-local::
+	@for i in $(TOPLEVEL_CONFIG); do \
+	  b=$$(expr /$$i : '.*/\([^/]*\)$$'); \
+	  echo rm -f $(DESTDIR)$(sysconfdir)/$$b; \
+	  rm -f $(DESTDIR)$(sysconfdir)/$$b; \
+	done
 
 ###--------------------------------------------------------------------------
 ### Release setup.
@@ -167,9 +272,11 @@ EXTRA_DIST		+= config/auto-version
 EXTRA_DIST		+= debian/changelog debian/control debian/copyright
 EXTRA_DIST		+= debian/rules debian/compat
 
+EXTRA_DIST		+= debian/distorted-keys-base.install
+
 EXTRA_DIST		+= debian/distorted-keys.install
 EXTRA_DIST		+= debian/distorted-keys.postinst
 
-EXTRA_DIST		+= debian/admin.users debian/admin.groups
+EXTRA_DIST		+= debian/claim-dir.install
 
 ###----- That's all, folks --------------------------------------------------