Skip to content

Commit f793d7b

Browse files
author
lenz@mysql.com
committed
- Removed obsolete and outdated man page files from the man
directory - these files are now maintained in the mysqldoc repository and included in the source distribution during the release build. Updated the configure.in script and Makefiles to create the man page file list at build time - Updated the file list in the RPM spec file to include all currently available man pages (this can not be done with wildcards, as the man pages are spread across several subpackages. However, RPM warns about unpackaged files, so newly added man pages can be spotted)
1 parent 983b7ad commit f793d7b

18 files changed

+32
-1799
lines changed

configure.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,10 +2202,14 @@ AC_ARG_WITH(man,
22022202
if test "$with_man" = "yes"
22032203
then
22042204
man_dirs="man"
2205+
man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`
2206+
man1_files=`echo $man1_files`
22052207
else
22062208
man_dirs=""
2209+
man1_files=""
22072210
fi
22082211
AC_SUBST(man_dirs)
2212+
AC_SUBST(man1_files)
22092213

22102214
# Shall we build the bench code?
22112215
AC_ARG_WITH(bench,

man/Makefile.am

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,8 @@
1717

1818
## Process this file with automake to create Makefile.in
1919

20-
man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
21-
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
22-
perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
23-
24-
EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
25-
mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
26-
mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
27-
mysqld_safe.1.in mysql_fix_privilege_tables.1.in
28-
29-
CLEANFILES = $(man_MANS)
30-
31-
SUFFIXES = .in
32-
33-
.in:
34-
@RM@ -f $@ $@-t
35-
@SED@ \
36-
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
37-
-e 's!@''sysconfdir''@!@sysconfdir@!' \
38-
-e 's!@''bindir''@!$(bindir)!g' \
39-
-e 's!@''libexecdir''@!$(libexecdir)!g' \
40-
-e 's!@''localstatedir''@!$(localstatedir)!g' \
41-
-e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
42-
$< > $@-t
43-
@MV@ $@-t $@
20+
man1_MANS = @man1_files@
21+
EXTRA_DIST = $(man1_MANS)
4422

4523
# Don't update the files from bitkeeper
4624
%::SCCS/s.%

man/isamchk.1.in

Lines changed: 0 additions & 145 deletions
This file was deleted.

man/isamlog.1.in

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)