1Don't install in mysql directory 2 3Installing libraries in a subdirectory of /usr/lib leads to no end of 4trouble. It requires either setting a RUN_PATH in the ELF files linked 5with it or adding the path to ld.so.conf and calling ldconfig on the 6target. 7 8So to simplify things, put everything in /usr/lib instead of 9/usr/lib/mysql 10 11Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> 12 13diff -Nrup mysql-5.1.73.orig/dbug/Makefile.am mysql-5.1.73/dbug/Makefile.am 14--- mysql-5.1.73.orig/dbug/Makefile.am 2013-11-04 19:52:27.000000000 +0100 15+++ mysql-5.1.73/dbug/Makefile.am 2015-12-14 00:34:58.567937603 +0100 16@@ -17,7 +17,7 @@ 17 18 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include 19 LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a 20-pkglib_LIBRARIES = libdbug.a 21+lib_LIBRARIES = libdbug.a 22 noinst_HEADERS = dbug_long.h 23 libdbug_a_SOURCES = dbug.c sanity.c 24 EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ 25diff -Nrup mysql-5.1.73.orig/libmysql/Makefile.shared mysql-5.1.73/libmysql/Makefile.shared 26--- mysql-5.1.73.orig/libmysql/Makefile.shared 2013-11-04 19:52:27.000000000 +0100 27+++ mysql-5.1.73/libmysql/Makefile.shared 2015-12-14 00:34:58.567937603 +0100 28@@ -25,7 +25,7 @@ MYSQLBASEdir= $(prefix) 29 ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded 30 ## until someone complains that they need separate options. 31 LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) 32-pkglib_LTLIBRARIES = $(target) 33+lib_LTLIBRARIES = $(target) 34 35 noinst_PROGRAMS = conf_to_src 36 37diff -Nrup mysql-5.1.73.orig/libmysqld/Makefile.am mysql-5.1.73/libmysqld/Makefile.am 38--- mysql-5.1.73.orig/libmysqld/Makefile.am 2013-11-04 19:52:27.000000000 +0100 39+++ mysql-5.1.73/libmysqld/Makefile.am 2015-12-14 00:34:58.567937603 +0100 40@@ -38,7 +38,7 @@ INCLUDES= -I$(top_builddir)/include -I$ 41 @condition_dependent_plugin_includes@ 42 43 noinst_LIBRARIES = libmysqld_int.a 44-pkglib_LIBRARIES = libmysqld.a 45+lib_LIBRARIES = libmysqld.a 46 SUBDIRS = . examples 47 libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc 48 libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ 49diff -Nrup mysql-5.1.73.orig/mysys/Makefile.am mysql-5.1.73/mysys/Makefile.am 50--- mysql-5.1.73.orig/mysys/Makefile.am 2013-11-04 19:52:27.000000000 +0100 51+++ mysql-5.1.73/mysys/Makefile.am 2015-12-14 00:34:58.567937603 +0100 52@@ -18,7 +18,7 @@ MYSQLSHAREdir = $(pkgdatadir) 53 MYSQLBASEdir= $(prefix) 54 INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ 55 -I$(top_srcdir)/include -I$(srcdir) 56-pkglib_LIBRARIES = libmysys.a 57+lib_LIBRARIES = libmysys.a 58 LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a 59 noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h 60 libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ 61diff -Nrup mysql-5.1.73.orig/storage/csv/Makefile.am mysql-5.1.73/storage/csv/Makefile.am 62--- mysql-5.1.73.orig/storage/csv/Makefile.am 2013-11-04 19:52:27.000000000 +0100 63+++ mysql-5.1.73/storage/csv/Makefile.am 2015-12-14 00:34:58.563937596 +0100 64@@ -30,7 +30,7 @@ DEFS = @DEFS@ 65 noinst_HEADERS = ha_tina.h transparent_file.h 66 67 EXTRA_LTLIBRARIES = ha_csv.la 68-pkglib_LTLIBRARIES = @plugin_csv_shared_target@ 69+lib_LTLIBRARIES = @plugin_csv_shared_target@ 70 ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) 71 ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN 72 ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc 73diff -Nrup mysql-5.1.73.orig/storage/heap/Makefile.am mysql-5.1.73/storage/heap/Makefile.am 74--- mysql-5.1.73.orig/storage/heap/Makefile.am 2013-11-04 19:52:27.000000000 +0100 75+++ mysql-5.1.73/storage/heap/Makefile.am 2015-12-14 00:34:58.563937596 +0100 76@@ -26,7 +26,7 @@ WRAPLIBS= 77 LDADD = 78 79 DEFS = @DEFS@ 80-pkglib_LIBRARIES = libheap.a 81+lib_LIBRARIES = libheap.a 82 noinst_PROGRAMS = hp_test1 hp_test2 83 noinst_LIBRARIES = libheap.a 84 hp_test1_LDFLAGS = @NOINST_LDFLAGS@ 85diff -Nrup mysql-5.1.73.orig/storage/myisam/Makefile.am mysql-5.1.73/storage/myisam/Makefile.am 86--- mysql-5.1.73.orig/storage/myisam/Makefile.am 2013-11-04 19:52:27.000000000 +0100 87+++ mysql-5.1.73/storage/myisam/Makefile.am 2015-12-14 00:34:58.563937596 +0100 88@@ -30,7 +30,7 @@ DEFS = @DEFS@ 89 EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in 90 pkgdata_DATA = mi_test_all mi_test_all.res 91 92-pkglib_LIBRARIES = libmyisam.a 93+lib_LIBRARIES = libmyisam.a 94 bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump 95 myisamchk_DEPENDENCIES= $(LIBRARIES) 96 myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ 97diff -Nrup mysql-5.1.73.orig/storage/myisammrg/Makefile.am mysql-5.1.73/storage/myisammrg/Makefile.am 98--- mysql-5.1.73.orig/storage/myisammrg/Makefile.am 2013-11-04 19:52:27.000000000 +0100 99+++ mysql-5.1.73/storage/myisammrg/Makefile.am 2015-12-14 00:34:58.563937596 +0100 100@@ -26,7 +26,7 @@ WRAPLIBS= 101 LDADD = 102 103 DEFS = @DEFS@ 104-pkglib_LIBRARIES = libmyisammrg.a 105+lib_LIBRARIES = libmyisammrg.a 106 noinst_HEADERS = myrg_def.h ha_myisammrg.h 107 noinst_LIBRARIES = libmyisammrg.a 108 libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ 109diff -Nrup mysql-5.1.73.orig/strings/Makefile.am mysql-5.1.73/strings/Makefile.am 110--- mysql-5.1.73.orig/strings/Makefile.am 2013-11-04 19:52:27.000000000 +0100 111+++ mysql-5.1.73/strings/Makefile.am 2015-12-14 00:34:58.567937603 +0100 112@@ -16,7 +16,7 @@ 113 # This file is public domain and comes with NO WARRANTY of any kind 114 115 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include 116-pkglib_LIBRARIES = libmystrings.a 117+lib_LIBRARIES = libmystrings.a 118 119 # Exact one of ASSEMBLER_X 120 if ASSEMBLER_x86 121@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ 122 123 FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ 124 125-str_test: str_test.c $(pkglib_LIBRARIES) 126- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) 127+str_test: str_test.c $(lib_LIBRARIES) 128+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(lib_LIBRARIES) 129 130 uctypedump: uctypedump.c 131 $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c 132 133-test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) 134+test_decimal$(EXEEXT): decimal.c $(lib_LIBRARIES) 135 $(CP) $(srcdir)/decimal.c ./test_decimal.c 136- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) 137+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(lib_LIBRARIES) 138 $(RM) -f ./test_decimal.c 139 140 # Don't update the files from bitkeeper 141diff -Nrup mysql-5.1.73.orig/tests/Makefile.am mysql-5.1.73/tests/Makefile.am 142--- mysql-5.1.73.orig/tests/Makefile.am 2013-11-04 19:52:27.000000000 +0100 143+++ mysql-5.1.73/tests/Makefile.am 2015-12-14 00:34:58.567937603 +0100 144@@ -51,11 +51,11 @@ mysql_client_test.o: mysql_client_fw.c 145 146 insert_test_SOURCES= insert_test.c 147 select_test_SOURCES= select_test.c 148-insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) 149-select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) 150+insert_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) 151+select_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) 152 153 bug25714_SOURCES= bug25714.c 154-bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) 155+bug25714_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) 156 157 # Fix for mit-threads 158 DEFS = -DMYSQL_CLIENT_NO_THREADS 159diff -Nrup mysql-5.1.73.orig/vio/Makefile.am mysql-5.1.73/vio/Makefile.am 160--- mysql-5.1.73.orig/vio/Makefile.am 2013-11-04 19:52:27.000000000 +0100 161+++ mysql-5.1.73/vio/Makefile.am 2015-12-14 00:34:58.567937603 +0100 162@@ -16,7 +16,7 @@ 163 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 164 $(openssl_includes) 165 LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) 166-pkglib_LIBRARIES = libvio.a 167+lib_LIBRARIES = libvio.a 168 169 noinst_HEADERS = vio_priv.h 170 171diff -Nrup mysql-5.1.73.orig/zlib/Makefile.am mysql-5.1.73/zlib/Makefile.am 172--- mysql-5.1.73.orig/zlib/Makefile.am 2013-11-04 19:52:27.000000000 +0100 173+++ mysql-5.1.73/zlib/Makefile.am 2015-12-14 00:34:58.567937603 +0100 174@@ -19,7 +19,7 @@ INCLUDES= -I$(top_builddir)/include -I$ 175 176 LIBS= $(NON_THREADED_LIBS) 177 178-pkglib_LTLIBRARIES = libz.la 179+lib_LTLIBRARIES = libz.la 180 noinst_LTLIBRARIES = libzlt.la 181 182 libz_la_LDFLAGS = -static 183