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