major cleanup, fonts no longer get dumped to /usr/bin/

1 files changed, 42 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8711d53ca52c..0f8e45df71f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 #TODO: fix icon installation
 
 pkgname=cubicsdr-git
-pkgver=20151225
+pkgver=20151226
 pkgrel=1
 pkgdesc="Cross-Platform Software-Defined Radio Application"
 arch=('any')
@@ -22,12 +22,15 @@ build() {
 	cd "${srcdir}/cubicsdr-git"
 	mkdir -p build
 	cd build
-	cmake ../ -DCMAKE_BUILD_TYPE=Release
-	make -j4
+	cmake -DCMAKE_BUILD_TYPE=Release ../
+	make -j2
+
+
 
 #convert the icon to png
-	cd $srcdir/cubicsdr-git/icon
-	convert CubicSDR.ico cubicsdr.png
+	
+	cd "$srcdir/cubicsdr-git/icon"
+	convert CubicSDR.ico CubicSDR.png
 
 }
 
@@ -37,37 +40,52 @@ build() {
 
 
 package() {
-#	install -dm755 "${pkgdir}/usr/bin"
+
+cd "$srcdir/$pkgname/build"
+
+
+#TODO: make this work
+#PREFIX="$pkgdir" make install
+
+
+
+	install -dm755 "${pkgdir}/usr/bin"
+	install -dm755 "${pkgdir}/usr/share"
+        install -dm755 "${pkgdir}/usr/share/cubicsdr"
 
 
 #TODO: detect arch to make this work on x86
 #for now change this manually on 32 bit systems
 	cd "${srcdir}/cubicsdr-git/build/x64"
         
-	install -Dm755 CubicSDR "${pkgdir}/usr/bin/cubicsdr"
-
-#TODO: find a way to drop these into /opt without cubicsdr bitching
-        install -Dm755 vera_sans_mono12.fnt "${pkgdir}/usr/bin/vera_sans_mono12.fnt"
-        install -Dm755 vera_sans_mono16.fnt "${pkgdir}/usr/bin/vera_sans_mono16.fnt"
-        install -Dm755 vera_sans_mono18.fnt "${pkgdir}/usr/bin/vera_sans_mono18.fnt"
-        install -Dm755 vera_sans_mono24.fnt "${pkgdir}/usr/bin/vera_sans_mono24.fnt"
-        install -Dm755 vera_sans_mono32.fnt "${pkgdir}/usr/bin/vera_sans_mono32.fnt"
-        install -Dm755 vera_sans_mono48.fnt "${pkgdir}/usr/bin/vera_sans_mono48.fnt"
-        install -Dm755 vera_sans_mono12_0.png "${pkgdir}/usr/bin/vera_sans_mono12_0.png"
-        install -Dm755 vera_sans_mono16_0.png "${pkgdir}/usr/bin/vera_sans_mono16_0.png"
-        install -Dm755 vera_sans_mono18_0.png "${pkgdir}/usr/bin/vera_sans_mono18_0.png"
-        install -Dm755 vera_sans_mono24_0.png "${pkgdir}/usr/bin/vera_sans_mono24_0.png"
-        install -Dm755 vera_sans_mono32_0.png "${pkgdir}/usr/bin/vera_sans_mono32_0.png"
-        install -Dm755 vera_sans_mono48_0.png "${pkgdir}/usr/bin/vera_sans_mono48_0.png"
+	install -Dm755 CubicSDR "${pkgdir}/usr/share/cubicsdr/cubicsdr"
+
+
+        install -Dm755 vera_sans_mono12.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12.fnt"
+        install -Dm755 vera_sans_mono16.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16.fnt"
+        install -Dm755 vera_sans_mono18.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18.fnt"
+        install -Dm755 vera_sans_mono24.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24.fnt"
+        install -Dm755 vera_sans_mono32.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32.fnt"
+        install -Dm755 vera_sans_mono48.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48.fnt"
+        install -Dm755 vera_sans_mono12_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12_0.png"
+        install -Dm755 vera_sans_mono16_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16_0.png"
+        install -Dm755 vera_sans_mono18_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18_0.png"
+        install -Dm755 vera_sans_mono24_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24_0.png"
+        install -Dm755 vera_sans_mono32_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32_0.png"
+        install -Dm755 vera_sans_mono48_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48_0.png"
 
 
 #install the icon
-	cd $srcdir/cubicsdr-git/icon
-	install -Dm644 "cubicsdr-0.png" "$pkgdir/usr/share/pixmaps/cubicsdr.png"
+	cd "$srcdir/cubicsdr-git/icon"
+	install -Dm644 "CubicSDR-0.png" "$pkgdir/usr/share/cubicsdr/CubicSDR.png"
 
 #install the .desktop file
 #dirty hack to get to the root dir (the one with the PKGBUILD)
-	cd $srcdir
+	cd $srcdir	
 	cd ..
 	install -Dm644 "cubicsdr.desktop" "$pkgdir/usr/share/applications/cubicsdr.desktop"
+
+#install the wrapper script into /usr/bin/
+        install -Dm755 wrapper.sh "${pkgdir}/usr/bin/cubicsdr"
+
 }