From 02c661dbcc9bf2be75d441c6019b72495d8cf4e1 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Sat, 1 Apr 2006 05:44:10 +0200 Subject: [PATCH] Makefile.am: Let "make install" install mysql-test-run.pl mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) --- mysql-test/Makefile.am | 3 ++- support-files/mysql.spec.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9a88aff8300..1ed703c562a 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,8 +32,9 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh EXTRA_DIST = $(EXTRA_SCRIPTS) +dist_bin_SCRIPTS = mysql-test-run.pl test_SCRIPTS = mysql-test-run install_test_db test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \ std_data/server-cert.pem std_data/server-key.pem diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 42958a3a871..b161ec13073 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -231,6 +231,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \ -felide-constructors -fno-exceptions -fno-rtti \ }\" \ + LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \ ./configure \ $* \ --enable-assembler \ @@ -689,6 +690,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Sat Apr 01 2006 Kent Boortz + +- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS + * Fri Jan 10 2006 Joerg Bruehe - Use "-i" on "make test-force";