diff options
| author | unknown <lenz@mysql.com> | 2005-06-23 11:41:01 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-23 11:41:01 +0200 |
| commit | ca01b8918e35eec5ec830ac0b97fdbfce808242d (patch) | |
| tree | 42a33000e32a615d5e4362a580de89f512052655 /Docs | |
| parent | 9dfb7aab152881736329e66bf1ea1e471753ebe9 (diff) | |
| parent | a0fedf78e6cd7d97ac54d89362d0ab7e6540b07a (diff) | |
| download | mariadb-git-ca01b8918e35eec5ec830ac0b97fdbfce808242d.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0.8-clone
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 10 | ||||
| -rwxr-xr-x | Docs/Support/generate-flag-images | 31 | ||||
| -rwxr-xr-x | Docs/Support/generate-text-files.pl | 2 |
3 files changed, 6 insertions, 37 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 6f8c51e79f0..b1f69381774 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -36,22 +36,22 @@ CLEAN_FILES: $(txt_files) GT = $(srcdir)/Support/generate-text-files.pl ../INSTALL-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing" "Tutorial" > $@ + perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@ ../INSTALL-WIN-SOURCE: mysql.info $(GT) - perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@ + perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@ # We put the description for the binary installation here so that # people who download source wont have to see it. It is moved up to # the toplevel by the script that makes the binary tar files. INSTALL-BINARY: mysql.info $(GT) - perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@ + perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@ ../EXCEPTIONS-CLIENT: mysql.info $(GT) - perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@ + perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@ ../support-files/MacOSX/ReadMe.txt: mysql.info $(GT) - perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@ + perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@ # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/Docs/Support/generate-flag-images b/Docs/Support/generate-flag-images deleted file mode 100755 index 21140388012..00000000000 --- a/Docs/Support/generate-flag-images +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -flags=`grep @image mirrors.texi | cut -d" " -f1 | cut -d/ -f2 | tr -d "}" | sort | uniq` - -set -x -cd Flags - -for c in $flags -do - # For PNM, to be used later - giftopnm ../Raw-Flags/$c.gif | pnmscale -xsize 30 > $c-tmp.pnm - pnmpaste $c-tmp.pnm 1 1 ../Images/flag-background.pnm > $c.pnm - rm -f $c-tmp.pnm - - # For GIF version - ppmtogif $c.pnm > $c.gif - # or cjpeg -optimize -quality 70 -outfile $c.jpg - - # For EPS version - pnmtops -noturn $c.pnm > $c.eps - - # For PDF version - ps2pdf $c.eps $c.pdf - - # For text version - echo -n "" > $c.txt - - # PNM isn't really needed - rm -f $c.pnm - -done diff --git a/Docs/Support/generate-text-files.pl b/Docs/Support/generate-text-files.pl index 6470baaa6e9..0829525f679 100755 --- a/Docs/Support/generate-text-files.pl +++ b/Docs/Support/generate-text-files.pl @@ -13,7 +13,7 @@ while (<IN>) { if ($in) { - if (/Node: $tnode,/) + if (/Node: $tnode,/ || /\[index/) { $in = 0; } |