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 | 4120228e12fd53e0677d3ba803e6801f5c828969 (patch) | |
| tree | 77d1b65db88cd4baa07ab38631578f6c5cfec1a5 /extra | |
| parent | a3cd2e2dab67a8d4abbd3c13e2455296a3304c56 (diff) | |
| parent | 7077649ef1a6201ba7f2c5792e8935ea0b4689cf (diff) | |
| download | mariadb-git-4120228e12fd53e0677d3ba803e6801f5c828969.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.
configure.in:
Add an "automake condition" whether InnoDB is configured
so that we can evaluate it for the (non)generation of "innochecksum".
In 5.1, the test command must differ from 5.0.
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 |