summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-04-03 08:00:57 +0200
committerunknown <knielsen@knielsen-hq.org>2012-04-03 08:00:57 +0200
commit34ed8f33795b639d21817003236ce0f6c069481d (patch)
tree167bbcd45df855ce93c8ded19dee4df1fdb2a915 /debian
parentb00ee6e8e5629f3ae34ad25151253ee3854dc7ca (diff)
downloadmariadb-git-34ed8f33795b639d21817003236ce0f6c069481d.tar.gz
lp:886550 Wrong installation path for some include files.
Now install all includes in a flat hierarchy under $PREFIX/include/mysq/, same as 5.3. User can override with -DINSTALL_INCLUDEDIR
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/dist/Debian/rules2
-rwxr-xr-xdebian/dist/Ubuntu/rules2
2 files changed, 0 insertions, 4 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 457502882c4..5cb22ae60d6 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -169,8 +169,6 @@ 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 provide our own version of this package for
# completeness, but we can use an existing version; mariadb-specic
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 69e1cba2893..592b2e4d7d1 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -169,8 +169,6 @@ 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 provide our own version of this package for
# completeness, but we can use an existing version; mariadb-specic