diff options
| author | unknown <lenz@mysql.com> | 2005-04-13 18:29:23 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-04-13 18:29:23 +0200 |
| commit | a7fae731d8eb42c3f7827d962f9cd42d784ca8d3 (patch) | |
| tree | 52a74673d834f9621165efb1c7ebcbdb3aae74bd | |
| parent | da48167883201853db5b69eab37e98093f837b66 (diff) | |
| download | mariadb-git-a7fae731d8eb42c3f7827d962f9cd42d784ca8d3.tar.gz | |
More changes to reflect the removal of manual.texi from the sources:
- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly
The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.
scripts/Makefile.am:
- removed fill_help_tables.sh and the creation of fill_help_tables.sql from the Makefile
(fill_help_tables.sql is now generated on the documentation server and will be added to
the offical source distribution during the Bootstrap
support-files/mysql.spec.sh:
- fixed a typo
| -rw-r--r-- | scripts/Makefile.am | 7 | ||||
| -rw-r--r-- | scripts/fill_help_tables.sql | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d5337df35b1..b170fa483b2 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 SUPERCLEANFILES = 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/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index c7e58f26a2f..f02acda07df 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -695,7 +695,7 @@ fi * Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com> -* Fixed the compilation comments and moved them into the separate build sections +- Fixed the compilation comments and moved them into the separate build sections for Max and Standard * Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com> |