diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
| commit | 58a75bb18b2a4080c8fae77024afed37f1be1314 (patch) | |
| tree | 4d9d65f5747636d6dea9295e79464108df24a9a2 /scripts/Makefile.am | |
| parent | 99b79db5dca6909456a40d859298ba3992b145da (diff) | |
| parent | a82671178919afba86ddfdf2b64321eb9afff8e5 (diff) | |
| download | mariadb-git-58a75bb18b2a4080c8fae77024afed37f1be1314.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b74e7b8df8b..be9354bd628 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -37,7 +37,8 @@ bin_SCRIPTS = @server_scripts@ \ mysqld_multi noinst_SCRIPTS = make_binary_distribution \ - make_sharedlib_distribution + make_sharedlib_distribution \ + convert-debug-for-diff EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ @@ -59,7 +60,8 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ mysqlhotcopy.sh \ mysqldumpslow.sh \ mysqld_multi.sh \ - mysqld_safe.sh + mysqld_safe.sh \ + convert-debug-for-diff.sh EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ @@ -91,6 +93,7 @@ CLEANFILES = @server_scripts@ \ mysqlhotcopy \ mysqldumpslow \ mysqld_multi \ + convert-debug-for-diff \ $(EXTRA_PROGRAMS) pkgplugindir = $(pkglibdir)/plugin |