fix *all* install paths, including in man pages and transition scripts

5 files changed, 10 insertions, 10 deletions

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 4e447c7..c924034 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -24,9 +24,6 @@ export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"__SYSDATADIR_PREFIX__/monkeysphere"}
-export SYSDATADIR
-
 # sharedir for authentication functions
 MASHAREDIR="${SYSSHAREDIR}/ma"
 
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 1eb5849..33a67cc 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -24,9 +24,6 @@ export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"__SYSDATADIR_PREFIX__/monkeysphere"}
-export SYSDATADIR
-
 # sharedir for host functions
 MHSHAREDIR="${SYSSHAREDIR}/mh"
 
diff --git a/src/share/defaultenv b/src/share/defaultenv
index 501478f..d72f139 100644
--- a/src/share/defaultenv
+++ b/src/share/defaultenv
@@ -9,8 +9,10 @@
 # Copyright 2009, released under the GPL, version 3 or later
 
 # managed directories
-SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"__SYSCONFDIR_PREFIX__/etc/monkeysphere"}
 export SYSCONFIGDIR
+SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"__SYSDATADIR_PREFIX__/monkeysphere"}
+export SYSDATADIR
 
 # default log level
 LOG_LEVEL="INFO"
diff --git a/src/transitions/0.23 b/src/transitions/0.23
index 3964558..82529f2 100755
--- a/src/transitions/0.23
+++ b/src/transitions/0.23
@@ -20,8 +20,9 @@
 # any unexpected errors should cause this script to bail:
 set -e
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
-SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
+export SYSSHAREDIR
+. "${SYSSHAREDIR}/defaultenv"
 
 MADATADIR="${SYSDATADIR}/authentication"
 MHDATADIR="${SYSDATADIR}/host"
diff --git a/src/transitions/0.28 b/src/transitions/0.28
index 5da6ab1..d21ec4e 100755
--- a/src/transitions/0.28
+++ b/src/transitions/0.28
@@ -16,7 +16,10 @@
 # any unexpected errors should cause this script to bail:
 set -e
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
+export SYSSHAREDIR
+. "${SYSSHAREDIR}/defaultenv"
+
 
 OLD_HOST_KEY_FILE="$SYSDATADIR"/ssh_host_rsa_key.pub.gpg
 if [ -f "$OLD_HOST_KEY_FILE" ] ; then