diff options
| author | Jameson Rollins <jrollins@finestructure.net> | 2010-09-14 12:26:58 -0400 |
|---|---|---|
| committer | Jameson Rollins <jrollins@finestructure.net> | 2010-09-14 12:26:58 -0400 |
| commit | c130b480b6e0d327a15f9da9d89ede7f58da32d1 (patch) | |
| tree | dab2c28bb11716eae45b5addc9ff8fee5f3c765f | |
| parent | 5de80495d5f73f712f084069c1a7afa6ec2daae4 (diff) | |
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.
| -rw-r--r-- | Changelog | 7 | ||||
| -rwxr-xr-x | Makefile | 9 | ||||
| -rwxr-xr-x | src/monkeysphere | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-authentication | 4 | ||||
| -rwxr-xr-x | src/monkeysphere-host | 4 |
5 files changed, 20 insertions, 6 deletions
@@ -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 ] @@ -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 8ce0c22..1cfafb6 100755 --- 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 af8c40d..4e447c7 100755 --- 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 6216dce..1eb5849 100755 --- 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 |