mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
- After merge fixes
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3: Auto merged BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc: Auto merged BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d: Auto merged scripts/Makefile.am: Auto merged scripts/make_win_src_distribution.sh: Auto merged BitKeeper/deleted/.del-texi2html~74632fe370dcec73: Auto merged configure.in: - manual merge support-files/mysql.spec.sh: - manual merge
This commit is contained in:
commit
3d73ea281d
72 changed files with 396 additions and 14696 deletions
|
|
@ -59,7 +59,6 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
|
|||
mysqld_multi.sh \
|
||||
mysql_tableinfo.sh \
|
||||
mysqld_safe.sh \
|
||||
fill_help_tables.sh \
|
||||
mysql_create_system_tables.sh
|
||||
|
||||
EXTRA_DIST = $(EXTRA_SCRIPTS) \
|
||||
|
|
@ -87,7 +86,6 @@ CLEANFILES = @server_scripts@ \
|
|||
mysqldumpslow \
|
||||
mysqld_multi \
|
||||
make_win_src_distribution \
|
||||
fill_help_tables \
|
||||
mysql_create_system_tables
|
||||
|
||||
DISTCLEANFILES = mysqlbug
|
||||
|
|
@ -151,7 +149,4 @@ SUFFIXES = .sh
|
|||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
||||
all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
|
||||
|
||||
fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
|
||||
./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
|
||||
all: make_win_src_distribution make_binary_distribution make_sharedlib_distribution
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue