summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
2 files changed, 6 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 24b5f05c945..ed54f11c4fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pioneer-git
pkgdesc = A game of lonely space adventure
- pkgver = 20200203.r13.g6acf6aef2
+ pkgver = 20200203.r227.g1efa5cf
pkgrel = 1
url = https://github.com/pioneerspacesim/pioneer
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 92baa04ee2d..efad0194159 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Manuel Lladosa <$(base64 --decode <<<'bWFub2xvbGxyQHJpc2V1cC5uZXQK')>
# Contributor: Tarn Burton <twburton at gmail dot com>
pkgname='pioneer-git'
-pkgver=20200203.r13.g6acf6aef2
+pkgver=20200203.r227.g1efa5cf
pkgrel=1
pkgdesc="A game of lonely space adventure"
arch=('x86_64')
@@ -26,7 +26,7 @@ build() {
-D PIONEER_DATA_DIR:PATH=/usr/share/pioneer/
make -C build
- # When game is installed models don't get compiled
+ # If game is installed models don't get compiled
# As a workaround we recompile 'modelcompiler' using $srcdir/data directory
# instead of /usr/share/pioneer
# Later, we let the things as them was
@@ -34,27 +34,17 @@ build() {
if [ -d /usr/share/pioneer ]; then
./bootstrap cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-D PIONEER_DATA_DIR:PATH="data"
- cd build ; mv modelcompiler modelcompiler.bak ; cd ..
make -C build modelcompiler
- cd build ; mv modelcompiler.bak modelcompiler ; cd ..
-
+ build/modelcompiler -b inplace
./bootstrap cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-D PIONEER_DATA_DIR:PATH=/usr/share/pioneer/
+ else
+ build/modelcompiler -b inplace
fi
-
-# make codedoc (execute naturaldocs manually)
-# This is development doc, I think it should not be in main game package
- #install -dm755 codedoc
- #naturaldocs -i ./src/ -i ./data/libs/ -xi ./src/data/ -o HTML codedoc/ -p ./nd/ -do -ro -s Default Local
- # Remove references to $srcdir. A 'naturaldocs' bug?
- #grep -Rl "$(pwd)" codedoc/ | xargs sed -i "s#$(pwd)/##g"
}
package() {
cd $pkgname
make -C build DESTDIR="$pkgdir" install
-
- #install -dm755 "$pkgdir/usr/share/doc/pioneer"
- #cp -R codedoc/* "$pkgdir/usr/share/doc/pioneer"
}