diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-25 13:39:54 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-25 13:39:54 +0100 |
| commit | cff7a9861a32c82ef51d18f42a09337399257db7 (patch) | |
| tree | 4e4dba52596777786b2f0e2f90336e49cb7b3671 /debian | |
| parent | 2aab4d66c69330846f5aa6a08501e9d5bab7f348 (diff) | |
| download | mariadb-git-cff7a9861a32c82ef51d18f42a09337399257db7.tar.gz | |
Add missing include and library files to libmariadbclient-dev package.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/dist/Debian/rules | 4 | ||||
| -rwxr-xr-x | debian/dist/Ubuntu/rules | 4 | ||||
| -rw-r--r-- | debian/libmariadbclient-dev.files | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 9994502ae1c..06b5b108e10 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -73,7 +73,7 @@ endif -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_SBINDIR=sbin \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DINSTALL_INCLUDEDIR=include \ + -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_INFODIR=share/info \ -DINSTALL_MANDIR=share/man \ \ @@ -169,6 +169,8 @@ install: build # libmysqlclient-dev: forgotten header file since 3.23.25? cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ cp include/my_dir.h $(TMP)/usr/include/mysql/ + mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/ + mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/ # mysql-common: We now provide our own config file. # can't be mariadb-common, other packages insist diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index 99d0e49adc3..2446566fd3f 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -73,7 +73,7 @@ endif -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_SBINDIR=sbin \ -DMYSQL_DATADIR=/var/lib/mysql \ - -DINSTALL_INCLUDEDIR=include \ + -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_INFODIR=share/info \ -DINSTALL_MANDIR=share/man \ \ @@ -169,6 +169,8 @@ install: build # libmysqlclient-dev: forgotten header file since 3.23.25? cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/ cp include/my_dir.h $(TMP)/usr/include/mysql/ + mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/ + mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/ # mysql-common: We now provide our own config file. # can't be mariadb-common, other packages insist diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files index 42a6c748b88..f75f049ec00 100644 --- a/debian/libmariadbclient-dev.files +++ b/debian/libmariadbclient-dev.files @@ -1,6 +1,8 @@ usr/bin/mysql_config usr/include/mysql/*.h +usr/include/mysql/psi/*.h usr/lib/libmysqlclient.a usr/lib/libmysqlclient_r.a +usr/lib/libmysqlservices.a usr/share/aclocal/mysql.m4 usr/share/man/man1/mysql_config.1 |