bk commit into 4.1 tree (kent:1.2491) BUG#16662

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2491 06/04/01 05:44:10 kent@stripped +2 -0
  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
    1.51 06/04/01 05:43:37 kent@stripped +2 -1
    Let "make install" install mysql-test-run.pl

  support-files/mysql.spec.sh
    1.114 06/04/01 04:35:33 kent@stripped +5 -0
    Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1-new

--- 1.113/support-files/mysql.spec.sh	2006-02-10 17:40:00 +01:00
+++ 1.114/support-files/mysql.spec.sh	2006-04-01 04:35:33 +02:00
@@ -231,6 +231,7 @@
 	CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \
 	          -felide-constructors -fno-exceptions -fno-rtti \
 		  }\" \
+	LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
 	./configure \
  	    $* \
 	    --enable-assembler \
@@ -689,6 +690,10 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Sat Apr 01 2006 Kent Boortz <kent@stripped>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
 * Fri Jan 10 2006 Joerg Bruehe <joerg@stripped>
 
 - Use "-i" on "make test-force";

--- 1.50/mysql-test/Makefile.am	2005-11-04 01:15:31 +01:00
+++ 1.51/mysql-test/Makefile.am	2006-04-01 05:43:37 +02:00
@@ -32,8 +32,9 @@
 
 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