X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/865fc4a1c4add30fbf1b6ab9569682d82e8da7c9..015c302c208a6267050cc8b6db31bfb09dfbffd5:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 48251c8..ce04560 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ profiledir		 = $(pkgconfdir)/profile.d
 
 bin_SCRIPTS		 =
 sbin_SCRIPTS		 =
-dist_pkglib_SCRIPTS	 =
-dist_pkglib_DATA	 =
-pkglib_DATA		 =
+dist_pkgdata_SCRIPTS	 =
+dist_pkgdata_DATA	 =
+pkgdata_DATA		 =
 dist_profile_DATA	 =
 noinst_DATA		 =
 USERV_CONFIG		 =
@@ -53,7 +53,7 @@ SUBSTVARS = \
 	bindir="$(bindir)" sbindir="$(sbindir)" \
 	sysconfdir="$(sysconfdir)" pkgconfdir="$(pkgconfdir)" \
 	pkgstatedir="$(localstatedir)/lib/$(PACKAGE)" \
-	pkglibdir="$(pkglibdir)" \
+	pkgdatadir="$(pkgdatadir)" \
 	user="$(user)"
 
 V_SUBST = $(V_SUBST_$V)
@@ -95,7 +95,7 @@ keys: keys.in Makefile
 		chmod +x keys.new && mv keys.new keys
 
 ## Utilities library.
-pkglib_DATA		+= keyfunc.sh
+pkgdata_DATA		+= keyfunc.sh
 EXTRA_DIST		+= keyfunc.sh.in
 CLEANFILES		+= keyfunc.sh
 keyfunc.sh: keyfunc.sh.in Makefile
@@ -103,17 +103,17 @@ keyfunc.sh: keyfunc.sh.in Makefile
 		mv keyfunc.sh.new keyfunc.sh
 
 ## Commands.
-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
+dist_pkgdata_SCRIPTS	+= keys.conceal
+dist_pkgdata_SCRIPTS	+= keys.delete-keeper
+dist_pkgdata_SCRIPTS	+= keys.keeper-cards
+dist_pkgdata_SCRIPTS	+= keys.keeper-nub
+dist_pkgdata_SCRIPTS	+= keys.list-keepers
+dist_pkgdata_SCRIPTS	+= keys.list-recov
+dist_pkgdata_SCRIPTS	+= keys.new-keeper
+dist_pkgdata_SCRIPTS	+= keys.new-recov
+dist_pkgdata_SCRIPTS	+= keys.recover
+dist_pkgdata_SCRIPTS	+= keys.reveal
+dist_pkgdata_SCRIPTS	+= keys.stash
 
 ## Common profiles.
 dist_profile_DATA	+= profile.d/00base
@@ -141,24 +141,24 @@ cryptop: cryptop.in Makefile
 		chmod +x cryptop.new && mv cryptop.new cryptop
 
 ## Key type libraries.
-dist_pkglib_DATA	+= ktype.gnupg
+dist_pkgdata_DATA	+= ktype.gnupg
 dist_profile_DATA	+= profile.d/01gnupg
 
-dist_pkglib_DATA	+= ktype.seccure
+dist_pkgdata_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
-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
+dist_pkgdata_SCRIPTS	+= cryptop.archive
+dist_pkgdata_SCRIPTS	+= cryptop.genkey
+dist_pkgdata_SCRIPTS	+= cryptop.list
+dist_pkgdata_SCRIPTS	+= cryptop.delkey
+dist_pkgdata_SCRIPTS	+= cryptop.recover
+dist_pkgdata_SCRIPTS	+= cryptop.info
+dist_pkgdata_SCRIPTS	+= cryptop.public
+dist_pkgdata_SCRIPTS	+= cryptop.encrypt
+dist_pkgdata_SCRIPTS	+= cryptop.decrypt
+dist_pkgdata_SCRIPTS	+= cryptop.sign
+dist_pkgdata_SCRIPTS	+= cryptop.verify
 
 ## Userv services configuration.
 USERV_CONFIG		+= userv/distorted-keys