fix

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 249a5544eac4..682adb76ae9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cpprestsdk
 	pkgdesc = A cross-platform, modern, and asynchronous library that enables developers to access and author connected applications
 	pkgver = 2.10.8
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Microsoft/cpprestsdk/
 	arch = i686
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = cpprestsdk
 	depends = openssl>=1.0.0
 	conflicts = casablanca
 	conflicts = casablanca-git
+	conflicts = cpprestsdk-git
 	source = cpprestsdk-2.10.8.tar.gz::https://github.com/Microsoft/cpprestsdk/archive/v2.10.8.tar.gz
 	sha512sums = d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df
 
diff --git a/PKGBUILD b/PKGBUILD
index 6fcb40d73ad6..b70f1a7a46da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=cpprestsdk
 pkgver=2.10.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform, modern, and asynchronous library that enables developers to access and author connected applications"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/Microsoft/cpprestsdk/"
 license=('Apache')
 depends=('boost' 'websocketpp' 'openssl>=1.0.0')
 makedepends=('cmake>=2.6.0')
-conflicts=('casablanca' 'casablanca-git')
+conflicts=('casablanca' 'casablanca-git' 'cpprestsdk-git')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Microsoft/cpprestsdk/archive/v${pkgver}.tar.gz")
 sha512sums=('d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df')
 
@@ -24,7 +24,8 @@ build() {
     -DBUILD_TESTS=OFF \
     -DBUILD_SAMPLES=OFF \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
   make  -j`nproc`
 }
 
@@ -33,5 +34,4 @@ package() {
   make -C build DESTDIR="${pkgdir}" install
   install -Dm644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
   install -Dm644 ThirdPartyNotices.txt ${pkgdir}/usr/share/licenses/${pkgname}/ThirdPartyNotices
-  mv "${pkgdir}"/usr/lib64 "${pkgdir}"/usr/lib
 }