diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-08-27 16:03:39 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-08-27 16:03:39 +0200 |
| commit | 811337dd72ebe1ff450691f5b44975b039d292d9 (patch) | |
| tree | 77d1b65db88cd4baa07ab38631578f6c5cfec1a5 /extra | |
| parent | 3d215551bb0e3346bd0058ed3ab7afb256846088 (diff) | |
| parent | ff3d230a03a69330d30ccbb43ce8550cdd6536d4 (diff) | |
| download | mariadb-git-811337dd72ebe1ff450691f5b44975b039d292d9.tar.gz | |
Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
Merge it up from 5.0 to 5.1,
adapt to some version differences.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index bc7289c7f7d..75422c4ee11 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -43,7 +43,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h bin_PROGRAMS = replace perror resolveip my_print_defaults \ - resolve_stack_dump mysql_waitpid innochecksum + resolve_stack_dump mysql_waitpid +# "innochecksum" should be switched +if BUILD_INNODB_TOOLS +bin_PROGRAMS += innochecksum +endif + noinst_PROGRAMS = charset2html EXTRA_PROGRAMS = comp_err EXTRA_DIST = CMakeLists.txt |