diff options
| author | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
| commit | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch) | |
| tree | 3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /Docs | |
| parent | 1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff) | |
| parent | 6e7a509d06824447e427dd44d5692489267d9c4b (diff) | |
| download | mariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz | |
Merge with 4.0.14
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 6 | ||||
| -rwxr-xr-x | Docs/Support/generate-text-files.pl | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index cf0a4632eda..cfe613c8e2e 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -41,10 +41,10 @@ paper: manual_a4.ps manual_letter.ps $(PDFMANUAL) # The Makefile contains the previous version so we can not use that include.texi: ../configure.in echo "@c This file is autogenerated by the Makefile" > $@ - echo -n "@set mysql_version " >> $@ + echo -n "@set mysqlversion " >> $@ grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \ sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@ - echo -n "@set default_port " >> $@ + echo -n "@set defaultport " >> $@ grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \ sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@ @@ -207,7 +207,7 @@ INSTALL-BINARY: mysql.info $(GT) perl -w $(GT) mysql.info "LGPL license" "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-text-files.pl b/Docs/Support/generate-text-files.pl index 570e579d926..6470baaa6e9 100755 --- a/Docs/Support/generate-text-files.pl +++ b/Docs/Support/generate-text-files.pl @@ -1,11 +1,11 @@ -#!/my/gnu/bin/perl -w -*- perl -*- +#!/usr/bin/perl -w -*- perl -*- # Generate text files from top directory from the manual. $from = shift(@ARGV); $fnode = shift(@ARGV); $tnode = shift(@ARGV); -open(IN, "$from") || die; +open(IN, "$from") || die "Cannot open $from: $!"; $in = 0; @@ -19,7 +19,7 @@ while (<IN>) } elsif (/^File: mysql.info/ || (/^ /)) { - # Just Skip node begginigs + # Just Skip node beginnings } else { @@ -38,3 +38,6 @@ while (<IN>) } close(IN); + +die "Could not find node \"$tnode\"" if ($in == 1); +exit 0; |