Skip to content

Commit aacb5fa

Browse files
author
[email protected]/kent-amd64.(none)
committed
Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0
into mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
2 parents 33f1f13 + fe129ce commit aacb5fa

File tree

6 files changed

+31
-99
lines changed

6 files changed

+31
-99
lines changed

‎Docs/INSTALL-BINARY‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
You can find information about how to install binary distributions at
3+
4+
http://dev.mysql.com/doc/refman/4.1/en/quick-standard-installation.html
5+
6+
The MySQL Reference Manual is also available in various formats on
7+
http://dev.mysql.com/doc; if you're interested in the DocBook XML
8+
sources go to http://svn.mysql.com.

‎Docs/Makefile.am‎

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,19 @@
1414
# along with this program; if not, write to the Free Software
1515
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1616

17-
noinst_SCRIPTS = Support/generate-text-files.pl
18-
19-
EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY
20-
21-
TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE \
22-
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
23-
24-
all-local: $(TXT_FILES)
17+
EXTRA_DIST = mysql.info INSTALL-BINARY
2518

2619
# make sure that "make install" installs the info page, too
2720
# automake only seems to take care of this automatically,
2821
# if we're building the info page from texi directly.
29-
install-data-hook: $(srcdir)/mysql.info
22+
install-data-hook: $(srcdir)/mysql.info $(srcdir)/INSTALL-BINARY
3023
$(mkinstalldirs) $(DESTDIR)$(infodir)
3124
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
25+
$(INSTALL_DATA) $(srcdir)/INSTALL-BINARY $(DESTDIR)$(infodir)
3226

3327
uninstall-local:
3428
@RM@ -f $(DESTDIR)$(infodir)/mysql.info
35-
36-
# This target is not used in builds, just for convinience
37-
CLEAN_FILES: $(TXT_FILES)
38-
touch $(TXT_FILES)
39-
40-
GT = $(srcdir)/Support/generate-text-files.pl
41-
42-
../INSTALL-SOURCE: $(srcdir)/mysql.info $(GT)
43-
perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@
44-
45-
../INSTALL-WIN-SOURCE: $(srcdir)/mysql.info $(GT)
46-
perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@
47-
48-
# We put the description for the binary installation here so that
49-
# people who download source wont have to see it. It is moved up to
50-
# the toplevel by the script that makes the binary tar files.
51-
INSTALL-BINARY: $(srcdir)/mysql.info $(GT)
52-
perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@
53-
54-
../support-files/MacOSX/ReadMe.txt: $(srcdir)/mysql.info $(GT)
55-
perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@
29+
@RM@ -f $(DESTDIR)$(infodir)/INSTALL-BINARY
5630

5731
# Don't update the files from bitkeeper
5832
%::SCCS/s.%

‎Docs/Support/generate-text-files.pl‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Docs/mysql.info‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,4 @@
1-
This is mysql.info, produced by makeinfo version 4.8 from manual.texi.
21

3-
START-INFO-DIR-ENTRY
4-
* mysql: (mysql). MySQL documentation.
5-
END-INFO-DIR-ENTRY
6-
7-
8-
File: mysql.info, Node: Top, Next: (dir), Prev: (dir), Up: (dir)
9-
10-
This is an empty placeholder file for the MySQL manual.
11-
12-
The MySQL manual is now maintained in a separate BitKeeper source tree!
13-
Please see `http://www.mysql.com/doc/en/Installing_source_tree.html'
14-
for more info on how to work with BitKeeper.
15-
16-
This file will be replaced with the current `mysql.info' when building
17-
the official source distribution.
18-
19-
You can find a specific manual for any older version of MySQL in the
20-
binary or source distribution for that version.
21-
22-
23-
24-
Tag Table:
25-
Node: Top166
26-
27-
End Tag Table
2+
The MySQL Reference Manual is available in various formats on
3+
http://dev.mysql.com/doc; if you're interested in the DocBook XML
4+
sources go to http://svn.mysql.com.

‎INSTALL-SOURCE‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
You can find information about how to install from a source distributions at
3+
4+
http://dev.mysql.com/doc/refman/4.1/en/installing-source.html
5+
6+
The MySQL Reference Manual is also available in various formats on
7+
http://dev.mysql.com/doc; if you're interested in the DocBook XML
8+
sources go to http://svn.mysql.com.

‎support-files/MacOSX/ReadMe.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
You can find information about how to install on Mac OS X at
3+
4+
http://dev.mysql.com/doc/refman/4.1/en/mac-os-x-installation.html
5+
6+
The MySQL Reference Manual is also available in various formats on
7+
http://dev.mysql.com/doc; if you're interested in the DocBook XML
8+
sources go to http://svn.mysql.com.

0 commit comments

Comments
 (0)