fix dirs - separate out patch into prepare

1 files changed, 12 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6cc2737d3c5f..47ca05f4fb76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,18 +31,22 @@ sha256sums=('d1ce2f5f656715f059e683e9d1d2c86ed0607194d3de97b469c25f0b78c64341'
             '6b2f735622f218e2ac5ef61475886fadfeeedd5f15b04fa0d54451162ee394ad'
             '5a887520f92ffde54835adf5507c6f8a93a54561866d07573d2a80bcaf8f3691')
 
-build() {
-  cd OSCAR-code
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   git apply ../*.patch || echo "No patches found"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   qmake OSCAR_QT.pro
   make -j$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
 }
 
 package() {
-  install -D $srcdir/OSCAR-code/oscar/OSCAR $pkgdir/usr/bin/oscar
-  install -Dm644 $srcdir/OSCAR-code/oscar/icons/logo-lg.png $pkgdir/usr/share/oscar/icon.png
-  install -Dm644 $srcdir/oscar.desktop $pkgdir/usr/share/applications/oscar.desktop
-
-  cp -dpr --no-preserve=ownership $srcdir/OSCAR-code/oscar/Html $pkgdir/usr/share/oscar
-  cp -dpr --no-preserve=ownership $srcdir/OSCAR-code/oscar/Translations $pkgdir/usr/share/oscar
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -Dm755 oscar/OSCAR "$pkgdir/usr/bin/oscar"
+  install -Dm644 oscar/icons/logo-lg.png "$pkgdir/usr/share/oscar/icon.png"
+  install -Dm644 oscar.desktop "$pkgdir/usr/share/applications/oscar.desktop"
+  cp -dpr --no-preserve=ownership oscar/Html "$pkgdir/usr/share/oscar"
+  cp -dpr --no-preserve=ownership oscar/Translations "$pkgdir/usr/share/oscar"
 }