[Pkg-mysql-commits] r1713 - mysql-dfsg-5.1/branches/unstable/debian

[Norbert Tretkowski]

tags 523928 pending
thanks

Author: nobse
Date: 2009-09-02 18:05:35 +0000 (Wed, 02 Sep 2009)
New Revision: 1713

Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/rules
Log:
Handle DEB_BUILD_OPTIONS correctly.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-02 09:37:16 UTC (rev 1712)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-02 18:05:35 UTC (rev 1713)
@@ -7,8 +7,10 @@
     - German, from Thomas Mueller. (closes: #544477)
   * Drop old_passwords option. (closes: #540366)
   * Enable hardening. (closes: #542746)
+  * Handle DEB_BUILD_OPTIONS correctly, patch from Stephen Depooter.
+    (closes: #523928)
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 01 Sep 2009 08:15:09 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 02 Sep 2009 20:04:51 +0200
 
 mysql-dfsg-5.1 (5.1.37-1) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/rules
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/rules	2009-09-02 09:37:16 UTC (rev 1712)
+++ mysql-dfsg-5.1/branches/unstable/debian/rules	2009-09-02 18:05:35 UTC (rev 1713)
@@ -29,7 +29,7 @@
 endif
 
 MAKE_TEST_TARGET=test-force
-ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
+ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
 # before a release, but it is long
     MAKE_TEST_TARGET=test-bt
@@ -128,7 +128,7 @@
 
 	cd $(builddir) && $(MAKE) $(MAKE_J)
 
-ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
+ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Don't know why the following is necessary...
 	cp unittest/unit.pl $(builddir)/unittest/
 	cp -r mysql-test/* $(builddir)/mysql-test/