From: Jameson Rollins <jrollins@finestructure.net>
Date: Tue, 14 Sep 2010 17:01:05 +0000 (-0400)
Subject: fix install target to not add DESTDIR to installed prefix
X-Git-Tag: monkeysphere_0.32-1~2^2~13
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2cbeae585d91f8d7571b33f7f47670267963a4e2;p=monkeysphere.git

fix install target to not add DESTDIR to installed prefix
---

diff --git a/Makefile b/Makefile
index 4afec91..7d87111 100755
--- a/Makefile
+++ b/Makefile
@@ -42,13 +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
-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR)$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(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
+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+	sed -i 's:__SYSDATADIR_PREFIX__:$(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
+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+	sed -i 's:__SYSDATADIR_PREFIX__:$(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