- 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


Docs/Makefile.am:
   - added reservedwords.texi (which gets included by manual.texi)
   - removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
   - Updated wording a bit after adding it to the tree
Makefile.am:
   - removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
   - Redirect standard error when checking for dpkg-architecture
     to avoid error message showing during configuration (thanks to
     John Wythe for the patch)
sql/Makefile.am:
   - replaced YFLAGS with AM_YFLAGS to make automake happy

5 files changed, 19 insertions, 8 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 17def904875..78aaadd4dd5 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -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.%
diff --git a/Docs/reservedwords.texi b/Docs/reservedwords.texi
new file mode 100644
index 00000000000..a6dddfe9a7a
--- /dev/null
+++ b/Docs/reservedwords.texi
@@ -0,0 +1,14 @@
+@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.
diff --git a/Makefile.am b/Makefile.am
index 55fc54826f7..41852d89ee5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/ltconfig b/ltconfig
index a5011a81c19..c4a16f77012 100755
--- a/ltconfig
+++ b/ltconfig
@@ -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_ "
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 659633727ae..17930242dc4 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -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