diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-09-27 21:40:07 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-09-27 21:40:07 +0200 |
| commit | 7571c81f24695b3f8969c9cd4f58b9ccba0b25c3 (patch) | |
| tree | 199c0b57bf36663d87066c2deafd6c7cf461cd2f /Makefile.am | |
| parent | 5d6fac278472e26a5b0652b9b2056f3f275e3525 (diff) | |
| parent | 4bba9ecec038a103968129e91578e32aa4bb4da4 (diff) | |
| download | mariadb-git-7571c81f24695b3f8969c9cd4f58b9ccba0b25c3.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a36d7b6c6f3..f29764e4143 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ - pstack \ + @pstack_dir@ \ @sql_union_dirs@ unittest storage plugin \ @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ |