[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (knielsen:2821)

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Sat Jul 3 09:51:54 EEST 2010


#At lp:maria/5.2

 2821 knielsen at knielsen-hq.org	2010-07-03
      Fixes for SphinxSE: fix `make dist` and `make distcheck`.
      modified:
        mysql-test/Makefile.am
        storage/sphinx/Makefile.am

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2010-06-01 19:52:20 +0000
+++ b/mysql-test/Makefile.am	2010-07-03 06:51:52 +0000
@@ -105,6 +105,7 @@ TEST_DIRS = t r include std_data std_dat
 	suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
 	suite/vcol suite/vcol/t suite/vcol/r suite/vcol/inc \
 	suite/oqgraph suite/oqgraph/t suite/oqgraph/r suite/oqgraph/include \
+	suite/sphinx \
 	suite/engines suite/engines/funcs suite/engines/iuds suite/engines/rr_trx \
 	suite/engines/funcs/r suite/engines/funcs/t suite/engines/iuds/r \
 	suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \

=== modified file 'storage/sphinx/Makefile.am'
--- a/storage/sphinx/Makefile.am	2010-07-02 20:33:21 +0000
+++ b/storage/sphinx/Makefile.am	2010-07-03 06:51:52 +0000
@@ -25,7 +25,6 @@ INCLUDES =              -I$(top_srcdir)/
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
                         -I$(srcdir)
-SUBDIRS =				../../include ../../mysys ../../strings ../../dbug ../../extra
 WRAPLIBS=
 
 LDADD =



More information about the commits mailing list