Browse Source

Move base system into the share directory

Bob Mottram 8 years ago
parent
commit
51f7f3d0fa
2 changed files with 4 additions and 1 deletions
  1. 3
    0
      Makefile
  2. 1
    1
      src/freedombone-vars

+ 3
- 0
Makefile View File

16
 	gzip -f9n ../${APP}_${VERSION}.orig.tar
16
 	gzip -f9n ../${APP}_${VERSION}.orig.tar
17
 install:
17
 install:
18
 	mkdir -p ${DESTDIR}${PREFIX}/bin
18
 	mkdir -p ${DESTDIR}${PREFIX}/bin
19
+	mkdir -p ${DESTDIR}/usr/share/${APP}/base
19
 	mkdir -p ${DESTDIR}/usr/share/${APP}/apps
20
 	mkdir -p ${DESTDIR}/usr/share/${APP}/apps
20
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
21
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
21
 	mkdir -p ${DESTDIR}/etc/${APP}
22
 	mkdir -p ${DESTDIR}/etc/${APP}
29
 	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
30
 	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
30
 	install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
31
 	install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
31
 	install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
32
 	install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
33
+	mv ${DESTDIR}${PREFIX}/bin/${APP}-base-* ${DESTDIR}/usr/share/${APP}/base
32
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
34
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
33
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
35
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
34
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
36
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
42
 	rm -f ${PREFIX}/share/man/man1/restore.1.gz
44
 	rm -f ${PREFIX}/share/man/man1/restore.1.gz
43
 	rm -f ${PREFIX}/share/man/man1/${APP}*.1.gz
45
 	rm -f ${PREFIX}/share/man/man1/${APP}*.1.gz
44
 	rm -rf ${PREFIX}/share/${APP}
46
 	rm -rf ${PREFIX}/share/${APP}
47
+	rm -rf /usr/share/${APP}
45
 	rm -f ${PREFIX}/bin/${APP}*
48
 	rm -f ${PREFIX}/bin/${APP}*
46
 	rm -f ${PREFIX}/bin/zeronetavahi
49
 	rm -f ${PREFIX}/bin/zeronetavahi
47
 	rm -f ${PREFIX}/bin/backup
50
 	rm -f ${PREFIX}/bin/backup

+ 1
- 1
src/freedombone-vars View File

81
 done
81
 done
82
 
82
 
83
 # include base system apps
83
 # include base system apps
84
-BASE_SYSTEM_FILES=$PROJECT_INSTALL_DIR/${PROJECT_NAME}-base-*
84
+BASE_SYSTEM_FILES=/usr/share/${PROJECT_NAME}/base/${PROJECT_NAME}-base-*
85
 for f in $BASE_SYSTEM_FILES
85
 for f in $BASE_SYSTEM_FILES
86
 do
86
 do
87
   source $f
87
   source $f