diff options
| author | unknown <lenz@mysql.com> | 2005-04-13 19:46:26 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-04-13 19:46:26 +0200 |
| commit | 3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d (patch) | |
| tree | 062cab7826ac51a8508bc7ee6ea88cd0b833514c /scripts | |
| parent | 26d7574462a8abb69c55f5280d43ce15b66b3a29 (diff) | |
| parent | c80e4f1affc9b037f56428f18642c5768300bdac (diff) | |
| download | mariadb-git-3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d.tar.gz | |
- 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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 7 | ||||
| -rw-r--r-- | scripts/fill_help_tables.sql | 3 | ||||
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c26cc8afedb..82a4fc2ca92 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -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 diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql new file mode 100644 index 00000000000..9f527c288e9 --- /dev/null +++ b/scripts/fill_help_tables.sql @@ -0,0 +1,3 @@ +-- fill_help_tables.sql - this file is a placeholder to satisfy build dependencies - +-- it will be replaced with the appropriate content by the Boostrap script that +-- creates the official source distribution. diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 25f5726c35a..8fdf23f3119 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -289,9 +289,7 @@ cd $SOURCE for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\ INSTALL-SOURCE INSTALL-WIN \ INSTALL-WIN-SOURCE \ - Docs/manual_toc.html Docs/manual.html \ - Docs/manual.txt Docs/mysqld_error.txt \ - Docs/INSTALL-BINARY Docs/internals.texi + Docs/INSTALL-BINARY do print_debug "Copying file '$i'" if [ -f $i ] |