Commit 82aca82d authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

- added a dummy file "reservedwords.texi" to the BK tree and the Makefiles, 

   so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration
parent 5758da14

Docs/Makefile.am

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ TEXINFO_TEX = Support/texinfo.tex 


noinst_SCRIPTS =	Support/texi2html Support/generate-text-files.pl \

			Support/generate-mirror-listing.pl

info_TEXINFOS =		manual.texi

info_TEXINFOS =		manual.texi reservedwords.texi



targets =		manual.txt mysql.info manual.html
@@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt INSTALL-BINARY 
all:			$(targets) txt_files



txt_files:		../INSTALL-SOURCE ../COPYING ../COPYING.LIB \

			../MIRRORS INSTALL-BINARY

			INSTALL-BINARY



CLEAN_FILES:		$(BUILD_SOURCES)

	touch $(BUILD_SOURCES)
@@ -145,8 +145,5 @@ INSTALL-BINARY: mysql.info $(GT) 
../COPYING.LIB:		mysql.info $(GT)

	perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@



../MIRRORS:		manual.texi $(srcdir)/Support/generate-mirror-listing.pl

	perl -w $(srcdir)/Support/generate-mirror-listing.pl manual.texi > $@



# Don't update the files from bitkeeper

%::SCCS/s.%

Docs/reservedwords.texi

0 → 100644
+14 −0
Original line number Diff line number Diff line 
@c This is a placeholder file for the autogenerated MySQL reserved

@c word list "reservedwords.texi", which is being included in

@c manual.texi when building the manual.

@c

@c This file will be replaced with the actual reserved word list

@c from the "mysqldoc" BK source tree when building the official

@c source distribution.

@c

@c Please note, that the manual is now maintained in a separate

@c "mysqldoc" BitKeeper tree! See

@c

@c http://www.mysql.com/doc/en/Installing_source_tree.html

@c

@c for more info on how to work with the MySQL BK source trees.

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

			COPYING COPYING.LIB

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

ltconfig

+1 −1
Original line number Diff line number Diff line
@@ -3013,7 +3013,7 @@ hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec 
# the DEB_BUILD_ARCH variable should be of non-zero length, indicating        

# that we are in the middle of a Debian package build (assuming the           

# user isn't doing anything strange with environment variables).              

if test -n "`dpkg-architecture -qDEB_BUILD_ARCH`" && ps | grep debuild | grep -v grep > /dev/null; then

if test -n "`dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null`" && ps | grep debuild | grep -v grep > /dev/null; then

  # Debian policy mandates that rpaths should not be encoded into a binary     

  # so it is overridden.                                                       

  hardcode_libdir_flag_spec=" -D_DEBIAN_PATCHED_LIBTOOL_ "

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ DEFS = -DMYSQL_SERVER \ 
# Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion

BUILT_SOURCES =		sql_yacc.cc sql_yacc.h

EXTRA_DIST =		udf_example.cc $(BUILT_SOURCES)

YFLAGS =		-d

AM_YFLAGS =		-d



link_sources:

	rm -f mini_client_errors.c