From ba2958d076a2214feee3a7ad2136826a46c272c0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 23 Jul 2013 21:20:58 +0100
Subject: [PATCH] Fixing /usr versus /usr/local dilemmas

---
 Makefile                                  | 10 +++++++---
 puppypackage/pybitmessage-0.3.4.pet.specs |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index adda5583..72a86ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,11 @@ install:
 	install -m 644 desktop/icon24.png ${DESTDIR}${PREFIX}/share/icons/hicolor/24x24/apps/${APP}.png
 	cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}
 	echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}
-	echo 'cd ${PREFIX}/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo 'if [ -d /usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo '  cd /usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo '  cd /usr/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
 	echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
 	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
 uninstall:
@@ -38,10 +42,10 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/share/applications/${APP}.desktop
 	rm -f ${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
-	${PREFIX}/share/pixmaps/${APP}.svg
+	rm -f ${PREFIX}/share/pixmaps/${APP}.svg
 clean:
 	rm -f ${APP} \#* \.#* gnuplot* *.png debian/*.substvars debian/*.log
 	rm -fr deb.* debian/${APP} rpmpackage/${ARCH_TYPE}
 	rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc
 	rm -f rpmpackage/*.src.rpm archpackage/*.gz archpackage/*.xz
-	rm -f  puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz
+	rm -f puppypackage/*.gz puppypackage/*.pet slackpackage/*.txz
diff --git a/puppypackage/pybitmessage-0.3.4.pet.specs b/puppypackage/pybitmessage-0.3.4.pet.specs
index 4bcf119b..01e8ed0d 100644
--- a/puppypackage/pybitmessage-0.3.4.pet.specs
+++ b/puppypackage/pybitmessage-0.3.4.pet.specs
@@ -1 +1 @@
-pybitmessage-0.3.4-1|PyBitmessage|0.3.4|1|Internet;mailnews;|3.9M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|
+pybitmessage-0.3.4-1|PyBitmessage|0.3.4|1|Internet;mailnews;|5.5M||pybitmessage-0.3.4-1.pet|+openssl,+python-qt4,+sqlite3,+sqlite3-dev,+python-openssl,+python-sip,+gst123|Send encrypted messages|ubuntu|precise|5|