From 51f7f3d0fa82dbb18b44b41343ad2e9954d991b3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 6 Jul 2016 20:31:52 +0100
Subject: [PATCH] Move base system into the share directory

---
 Makefile             | 3 +++
 src/freedombone-vars | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c0817aea..4d13a7a7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ source:
 	gzip -f9n ../${APP}_${VERSION}.orig.tar
 install:
 	mkdir -p ${DESTDIR}${PREFIX}/bin
+	mkdir -p ${DESTDIR}/usr/share/${APP}/base
 	mkdir -p ${DESTDIR}/usr/share/${APP}/apps
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
 	mkdir -p ${DESTDIR}/etc/${APP}
@@ -29,6 +30,7 @@ install:
 	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
 	install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
 	install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
+	mv ${DESTDIR}${PREFIX}/bin/${APP}-base-* ${DESTDIR}/usr/share/${APP}/base
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
@@ -42,6 +44,7 @@ uninstall:
 	rm -f ${PREFIX}/share/man/man1/restore.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}*.1.gz
 	rm -rf ${PREFIX}/share/${APP}
+	rm -rf /usr/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}*
 	rm -f ${PREFIX}/bin/zeronetavahi
 	rm -f ${PREFIX}/bin/backup
diff --git a/src/freedombone-vars b/src/freedombone-vars
index 143dacfe..99b9ca38 100755
--- a/src/freedombone-vars
+++ b/src/freedombone-vars
@@ -81,7 +81,7 @@ do
 done
 
 # include base system apps
-BASE_SYSTEM_FILES=$PROJECT_INSTALL_DIR/${PROJECT_NAME}-base-*
+BASE_SYSTEM_FILES=/usr/share/${PROJECT_NAME}/base/${PROJECT_NAME}-base-*
 for f in $BASE_SYSTEM_FILES
 do
   source $f