diff options
| author | msvensson@pilot.blaudden <> | 2007-04-18 13:22:32 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-18 13:22:32 +0200 |
| commit | dd0d2146c328d2bbdc8600bf64355010c5aec2aa (patch) | |
| tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /Makefile.am | |
| parent | 8fdf9c5f64b7020458ea0be8090e4b572804c4a3 (diff) | |
| parent | 20e622dcf3d287cb8934ab7ad1d9a0cc90f88a45 (diff) | |
| download | mariadb-git-dd0d2146c328d2bbdc8600bf64355010c5aec2aa.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-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 28551d52da7..9e9520c29d8 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@ @yassl_dir@ \ - @readline_topdir@ sql-common \ + @readline_topdir@ sql-common scripts \ @thread_dirs@ pstack \ - @sql_union_dirs@ scripts @man_dirs@ tests \ + @sql_union_dirs@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ |