Fix issue with libmaodbc.so being installed in subfolder

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 541c8e517bc9..2b6d7cd6a380 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mariadb-connector-odbc
 	pkgdesc = A standardized, LGPL licensed ODBC database driver for MariaDB
 	pkgver = 3.1.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index defe483cd53a..942783b24bd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=mariadb-connector-odbc
 conflicts=('mariadb-connector-odbc-bin')
 pkgver=3.1.11
 _c_pkgver=3.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A standardized, LGPL licensed ODBC database driver for MariaDB"
 arch=('x86_64' 'armv7h')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
@@ -43,4 +43,8 @@ build() {
 package() {
     cd build
     DESTDIR="$pkgdir" cmake -DCOMPONENT=ODBCLibs -P cmake_install.cmake
+    if [ -f "$pkgdir/usr/lib/mariadb/libmaodbc.so" ]; then
+        mv "$pkgdir/usr/lib/mariadb/libmaodbc.so" "$pkgdir/usr/lib/libmaodbc.so"
+        rmdir "$pkgdir/usr/lib/mariadb"
+    fi
 }