Commit b80ed3bb authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0

parents 1e87c820 0dd1ab1a

Build-tools/Bootstrap

+4 −0
Original line number Diff line number Diff line
@@ -288,6 +288,10 @@ unless ($opt_skip_manual) 
		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

	}

        system ("rm $target_dir/Docs/Images/Makefile*") == 0

        or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");

        system ("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images") == 0

        or &abort("Could not copy image files in $target_dir/Docs/Images/!");

}



#

Docs/Images/Makefile.am

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

#

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Library General Public

# License as published by the Free Software Foundation; either

# version 2 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Library General Public License for more details.

#

# You should have received a copy of the GNU Library General Public

# License along with this library; if not, write to the Free

# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



## Process this file with automake to create Makefile.in



# This is a dummy file to satisfy the hierarchy of Makefiles.

# When a release is built, the true Makefile will be copied 

# together with the "real" files in this directory.



EXTRA_DIST =		



# Nothing to create in this dummy directory.

all:

	:



# Nothing to cleanup in this dummy directory.

clean:

	:



# Don't update the files from bitkeeper

%::SCCS/s.%

Docs/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ BUILT_SOURCES = $(targets) manual_toc.html include.texi 
EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \

			INSTALL-BINARY reservedwords.texi 



SUBDIRS =		Images



all:			$(targets) txt_files



txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -2711,7 +2711,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl 
 pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl

 merge/Makefile dbug/Makefile scripts/Makefile dnl

 include/Makefile sql-bench/Makefile tools/Makefile dnl

 tests/Makefile Docs/Makefile support-files/Makefile dnl

 tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl

 support-files/MacOSX/Makefile mysql-test/Makefile dnl

 netware/Makefile dnl

 include/mysql_version.h dnl