chiark / gitweb /
Put scripts in `pkgsharedir' rather than `pkglibdir'.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 8 Jun 2013 12:32:27 +0000 (13:32 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 8 Jun 2013 12:35:19 +0000 (13:35 +0100)
Otherwise Automake complains.

Makefile.am
cryptop.in
debian/distorted-keys-base.install
debian/distorted-keys.install
keys.in
pubkeyop.in

index 48251c8..ce04560 100644 (file)
@@ -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
index 75a553b..4858a53 100755 (executable)
@@ -26,7 +26,7 @@
 set -e
 : ${ETC=@pkgconfdir@}
 : ${KEYS=@pkgstatedir@}
-: ${KEYSLIB=@pkglibdir@}
+: ${KEYSLIB=@pkgdatadir@}
 export ETC KEYS KEYSLIB
 
 . "$KEYSLIB"/keyfunc.sh
index 94dc89c..92336d2 100644 (file)
@@ -1,4 +1,4 @@
 usr/bin/pubkeyop
-usr/lib/distorted-keys/keyfunc.sh
-usr/lib/distorted-keys/ktype.*
+usr/share/distorted-keys/keyfunc.sh
+usr/share/distorted-keys/ktype.*
 etc/distorted-keys/keys.conf
index e1c761b..f78cc38 100644 (file)
@@ -2,8 +2,8 @@ usr/bin/cryptop
 usr/bin/extract-profile
 usr/bin/shamir
 usr/sbin/keys
-usr/lib/distorted-keys/keys.*
-usr/lib/distorted-keys/cryptop.*
+usr/share/distorted-keys/keys.*
+usr/share/distorted-keys/cryptop.*
 etc/userv/default.d/distorted-keys
 etc/distorted-keys/admin.*
 etc/distorted-keys/keeper-cards.tex
diff --git a/keys.in b/keys.in
index cee261c..9ec6dca 100755 (executable)
--- a/keys.in
+++ b/keys.in
@@ -26,7 +26,7 @@
 set -e
 : ${ETC=@pkgconfdir@}
 : ${KEYS=@pkgstatedir@}
-: ${KEYSLIB=@pkglibdir@}
+: ${KEYSLIB=@pkgdatadir@}
 export ETC KEYS KEYSLIB
 
 . "$KEYSLIB"/keyfunc.sh
index 91bbcc8..42eed55 100755 (executable)
@@ -26,7 +26,7 @@
 set -e
 : ${ETC=@pkgconfdir@}
 : ${KEYS=@pkgstatedir@}
-: ${KEYSLIB=@pkglibdir@}
+: ${KEYSLIB=@pkgdatadir@}
 export ETC KEYS KEYSLIB
 
 . "$KEYSLIB"/keyfunc.sh