summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Bekaert2022-12-08 10:47:05 +0100
committerRuben Bekaert2022-12-08 10:47:05 +0100
commit0f6afa3426440965a87f96e81f50475b8426093d (patch)
treeea3bbc8f9506867ae4017bda9c6e98d1930ce5ae
parent73d8dc4d94492ae139dad5b88a707ce290ebdbc9 (diff)
downloadaur-0f6afa3426440965a87f96e81f50475b8426093d.tar.gz
Solved manpage conflict
-rw-r--r--PKGBUILD7
-rw-r--r--gplates.desktop2
2 files changed, 4 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 95b993dae04e..fc333acf8522 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ sha256sums=(
"7d4be9d524d1fcbb6a81de29bd1d4b13133082db23f0808965c5efe30e9538ab"
"3f65493ff661f36cdc1cff9f672a529a922783b481bbd4dd9d997701d7e7b6ec"
"9335fb98b21bc03c1cbec21ca945bded6ac60f66bb14997654b1829c1bd7265b"
- "5f044dcb53edc372730fa32916f9c6596d61b06bfaf59963fc65af357b3ada3e"
+ "c9cf5e841e3bc1e730c5c1fa00a1137f532de4c2859637e67d1682f021eebb11"
)
prepare() {
@@ -35,14 +35,13 @@ prepare() {
build() {
cd "${srcdir}/${pkgname}_${pkgver}_src"
- cmake .
+ cmake -DCMAKE_INSTALL_PREFIX="/usr/" -DCMAKE_BUILD_TYPE=Release .
make
}
package() {
cd "${srcdir}/${pkgname}_${pkgver}_src"
make DESTDIR="${pkgdir}/" install
- mkdir -p "${pkgdir}/usr/share/${pkgname}"
- install "${srcdir}/icon.png" -t "${pkgdir}/usr/local/share/${pkgname}"
+ install "${srcdir}/icon.png" -t "${pkgdir}/usr/share/${pkgname}"
install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
}
diff --git a/gplates.desktop b/gplates.desktop
index 510f8f0cbbe3..76c86a837e92 100644
--- a/gplates.desktop
+++ b/gplates.desktop
@@ -5,4 +5,4 @@ Terminal=false
Exec=env QT_QPA_PLATFORM=xcb /usr/bin/gplates
Name=GPlates
Comment=Interactive visualisation of plate-tectonics
-Icon=/usr/local/share/gplates/icon.png
+Icon=/usr/share/gplates/icon.png