diff options
| author | unknown <serg@janus.mylan> | 2007-02-22 17:05:24 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-02-22 17:05:24 +0100 |
| commit | 506af377b3af4b677fce194e0935aca4cd230a5a (patch) | |
| tree | 15573a637953fa4faee63184160849c81c9c5e6c /support-files/Makefile.am | |
| parent | 61587c18639f4dfeb4e30e490c8b7785341c1eb5 (diff) | |
| parent | 4957c80827e8f1ecb0544c4fb8d2f7e95962e349 (diff) | |
| download | mariadb-git-506af377b3af4b677fce194e0935aca4cd230a5a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
Diffstat (limited to 'support-files/Makefile.am')
| -rw-r--r-- | support-files/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index f2533100117..f335b511edd 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -43,6 +43,9 @@ pkgdata_DATA = my-small.cnf \ pkgdata_SCRIPTS = mysql.server +aclocaldir = $(datadir)/aclocal +aclocal_DATA = mysql.m4 + noinst_DATA = mysql-@VERSION@.spec \ MySQL-shared-compat.spec |