- manual merge of the new node names

This commit is contained in:
lenz@mysql.com 2005-06-23 11:34:58 +02:00
commit cacb7199d3
3 changed files with 6 additions and 37 deletions

View File

@ -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.%

View File

@ -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

View File

@ -13,7 +13,7 @@ while (<IN>)
{
if ($in)
{
if (/Node: $tnode,/)
if (/Node: $tnode,/ || /\[index/)
{
$in = 0;
}