summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Tran2019-11-05 00:53:37 +1100
committerVictor Tran2019-11-05 00:53:37 +1100
commit52a748c3908f12152efa312358d2518247a77c09 (patch)
tree21f3a81ae87fd98efecfaa24d7eef39fb285b5e7
parent6a2cf422b6a693b5f16d0286c358d4c3210c673e (diff)
downloadaur-52a748c3908f12152efa312358d2518247a77c09.tar.gz
Add conflicting packages
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed70b7d82df2..0a445b3ebcd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,4 +14,5 @@ pkgbase = discord-rpc-api
pkgname = discord-rpc-api
pkgname = discord-rpc-api-static
+ conflicts = discord-rpc-api
diff --git a/PKGBUILD b/PKGBUILD
index f93806af3ffa..7e24b0516075 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,13 +18,13 @@ build() {
export CXX=g++
cd "$srcdir"/discord-rpc-$pkgver
- mkdir build-shared
+ mkdir -p build-shared
pushd build-shared
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF
cmake --build . --config Release
popd
- mkdir build-static
+ mkdir -p build-static
pushd build-static
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF
cmake --build . --config Release
@@ -38,6 +38,9 @@ package_discord-rpc-api() {
}
package_discord-rpc-api-static() {
+ conflicts=("discord-rpc-api")
+ provices=("discord-rpc-api-static")
+
pushd "$srcdir"/discord-rpc-$pkgver/build-static
cmake --build . --config Release --target install -- DESTDIR=$pkgdir
popd