fix specification of install directories in top level scripts.

Various install paths were hard coded in the top level scripts.  This
was causing problems for non-standard install locations.  Also added
use of LOCALSTATEDIR variable to specify /var/lib path.

diff --git a/Changelog b/Changelog
index d3fdb1b9421fce99653377e759bcf56ce0f1d90e..38504282a77f503af8200468a229534e78ae39da 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.32~pre) unstable; urgency=low
+
+   * Fix specification of install paths in top level scripts (closes MS
+    #2491)
+
+ -- Jameson Rollins <jrollins@finestructure.net>  Tue, 14 Sep 2010 12:24:35 -0400
+
 monkeysphere (0.31) unstable; urgency=low
 
   [ Daniel Kahn Gillmor ]

diff --git a/Makefile b/Makefile
index 66449275a42ca257848f2c24d57af79cddc4ace6..4afec91a73d6fe71540fcde4dc106b8fdd26c275 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ ETCPREFIX ?=
 ETCSUFFIX ?= 
 PREFIX ?= /usr
 MANPREFIX ?= $(PREFIX)/share/man
+LOCALSTATEDIR ?= /var/lib
 
 # nothing actually needs to be built now.
 all: 
@@ -41,7 +42,13 @@ install: all installman
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
        install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
-       install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+       sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR)$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+       install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+       sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR)$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+       sed -i 's:__SYSDATADIR_PREFIX__:$(DESTDIR)$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+       install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+       sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR)$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+       sed -i 's:__SYSDATADIR_PREFIX__:$(DESTDIR)$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
        install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
        install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 8ce0c2267a4b172f4bc818d45e461325979e35bf..1cfafb691bdeab8874312ab55b37fb98ce54e21c 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -16,7 +16,7 @@ set -e
 
 PGRM=$(basename $0)
 
-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
 export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index af8c40dd5e49f8d775675c06c542d8981d9023af..4e447c7c58aa50fb8546d5ba8048e671c5857c8a 100755 (executable)
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -19,12 +19,12 @@ set -o pipefail
 
 PGRM=$(basename $0)
 
-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
 export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
+SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"__SYSDATADIR_PREFIX__/monkeysphere"}
 export SYSDATADIR
 
 # sharedir for authentication functions

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 6216dce8d9c67da68f99fb391a6ab41472b14dfe..1eb58492b81d8bbbd4ac64d0226bfdbd6b5af686 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -19,12 +19,12 @@ set -o pipefail
 
 PGRM=$(basename $0)
 
-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"}
 export SYSSHAREDIR
 . "${SYSSHAREDIR}/defaultenv"
 . "${SYSSHAREDIR}/common"
 
-SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
+SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"__SYSDATADIR_PREFIX__/monkeysphere"}
 export SYSDATADIR
 
 # sharedir for host functions