diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-29 13:43:34 +0400 |
| commit | 74214b8635c9373abe6ec8f9e7f5f990d13f9fe9 (patch) | |
| tree | 392482e50ca6ab4d828672da8aa5721919eda571 /configure.in | |
| parent | 3c9ba0208ae236435f5bad462b41f0df72aaad28 (diff) | |
| parent | 04d60b389701329d934ed2f7690cc2fd686b9f4a (diff) | |
| download | mariadb-git-74214b8635c9373abe6ec8f9e7f5f990d13f9fe9.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.in b/configure.in index cf3d7b72040..b84c07bc76a 100644 --- a/configure.in +++ b/configure.in @@ -2339,12 +2339,16 @@ then man_dirs="man" man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'` man1_files=`echo $man1_files` + man8_files=`ls -8 $srcdir/man/*.8 | sed -e 's;^.*man/;;'` + man8_files=`echo $man8_files` else man_dirs="" man1_files="" + man8_files="" fi AC_SUBST(man_dirs) AC_SUBST(man1_files) +AC_SUBST(man8_files) # Shall we build the bench code? AC_ARG_WITH(bench, |