2a2834
Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
2a2834
breaks at least two packaging commandments, so we put them into $libdir
2a2834
instead.  That means we have to hack the file_contents regression test
2a2834
to know about this.
2a2834
2a2834
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
2a2834
2a2834
2a2834
diff -up mariadb-5.5.34/mysql-test/t/file_contents.test.p10 mariadb-5.5.34/mysql-test/t/file_contents.test
2a2834
--- mariadb-5.5.34/mysql-test/t/file_contents.test.p10	2013-11-20 13:28:56.000000000 +0100
2a2834
+++ mariadb-5.5.34/mysql-test/t/file_contents.test	2013-11-22 08:50:30.244702013 +0100
2a2834
@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
2a2834
     # RedHat/Debian: version number in directory name
2a2834
     $dir_docs = glob "$dir_docs/mariadb-server-*";
2a2834
     $dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs;
2a2834
+
2a2834
+    # All the above is entirely wacko, because these files are not docs;
2a2834
+    # they should be kept in libdir instead.  mtr does not provide a nice
2a2834
+    # way to find libdir though, so we have to kluge it like this:
2a2834
+    if (-d "/usr/lib64/mysql") {
2a2834
+       $dir_docs = "/usr/lib64/mysql";
2a2834
+    } else {
2a2834
+       $dir_docs = "/usr/lib/mysql";
2a2834
+    }
2a2834
   }
2a2834
   # Slackware
2a2834
   $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;