diff options
| author | kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se <> | 2006-07-28 23:40:05 +0200 |
|---|---|---|
| committer | kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se <> | 2006-07-28 23:40:05 +0200 |
| commit | 01f5bc3a8336706f822457d95d448f034e5143f5 (patch) | |
| tree | 0af134d9729c1f8de5e0fdbe54ed1ab0b931f3a0 | |
| parent | 4e845cccc484f690556925daa6dd81cd83e5b3a8 (diff) | |
| parent | 2faea9832477756135da5f9600fbb24032f5a98b (diff) | |
| download | mariadb-git-01f5bc3a8336706f822457d95d448f034e5143f5.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 314f9117ad8..600ca00cbe3 100644 --- a/configure.in +++ b/configure.in @@ -2380,12 +2380,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, diff --git a/man/Makefile.am b/man/Makefile.am index 9702c4b2ace..5753259fd3d 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -18,7 +18,8 @@ ## Process this file with automake to create Makefile.in man1_MANS = @man1_files@ -EXTRA_DIST = $(man1_MANS) +man8_MANS = @man8_files@ +EXTRA_DIST = $(man1_MANS) $(man8_MANS) # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 9b1cddbb7e4..b2eb9f3b727 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -80,7 +80,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ if [ $BASE_SYSTEM != "netware" ] ; then mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \ - $BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test + $BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test chmod o-rwx $BASE/data $BASE/data/* fi @@ -203,6 +203,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then fi if [ -d man ] ; then $CP man/*.1 $BASE/man/man1 + $CP man/*.8 $BASE/man/man8 fi fi @@ -287,7 +288,6 @@ else fi # Make safe_mysqld a symlink to mysqld_safe for backwards portability -# To be removed in MySQL 4.1 (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld ) # Clean up if we did this from a bk tree diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 23bd98aa3c2..9cead3fce3f 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -546,7 +546,7 @@ fi %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1* %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysqld.1* +%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1* |