diff options
| author | msvensson@pilot.blaudden <> | 2007-04-18 14:18:55 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-18 14:18:55 +0200 |
| commit | 01133f8e6f1d1c1ef46b2befda753756e12d7252 (patch) | |
| tree | 0f985ddfffc9a795634474887ee05e3d46ec88c9 /Makefile.am | |
| parent | f1776dc5514f9274b1812d7c0ef5df8d39f4a661 (diff) | |
| parent | dd0d2146c328d2bbdc8600bf64355010c5aec2aa (diff) | |
| download | mariadb-git-01133f8e6f1d1c1ef46b2befda753756e12d7252.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ee5882e512a..24f646cc8e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ unittest storage plugin \ + @sql_union_dirs@ scripts unittest storage plugin \ @sql_server@ scripts @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench @tools_dirs@ \ |