diff options
| -rw-r--r-- | dev-db/mariadb-connector-odbc/files/odbcinst.ini | 4 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dev-db/mariadb-connector-odbc/files/odbcinst.ini b/dev-db/mariadb-connector-odbc/files/odbcinst.ini deleted file mode 100644 index e196e032362f..000000000000 --- a/dev-db/mariadb-connector-odbc/files/odbcinst.ini +++ /dev/null @@ -1,4 +0,0 @@ -[maodbc] -Description=MariaDB ODBC Driver -Driver=/usr/lib/libmaodbc.so -Threading=0 diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild index 62623dc60a49..9f52492f5727 100644 --- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild +++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild @@ -8,14 +8,13 @@ inherit cmake-multilib flag-o-matic DESCRIPTION="MariaDB Connector/ODBC" HOMEPAGE="https://downloads.mariadb.org/connector-odbc/" SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz" +S="${S}-src" LICENSE="LGPL-2.1" SLOT="0/3.1" KEYWORDS="~amd64 ~x86" IUSE="ssl" -S="${S}-src" - # USE=ssl merely enables the configuration options (seemingly for interactive # sessions) and does not cause direct linking to any SSL libraries. However, # it doesn't make sense enable these configuration options unless the @@ -39,6 +38,8 @@ multilib_src_configure() { -DUSE_SYSTEM_INSTALLED_LIB=YES -DINSTALL_DOCDIR="/usr/share/doc/${PF}" -DINSTALL_LICENSEDIR="/usr/share/doc/${PF}" + -DINSTALL_LIBDIR="$(get_libdir)/mariadb" + -DINSTALL_PCDIR="$(get_libdir)/pkgconfig" #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)" ) cmake_src_configure @@ -47,6 +48,8 @@ multilib_src_configure() { multilib_src_install_all() { insinto /usr/share/${PN} doins odbcinst.ini + + rm "${ED}/usr/share/doc/${PF}/COPYING" || die "Error removing COPYING file from installation" } pkg_postinst() { |