bk commit into 5.1 tree (rafal:1.2475)

[rsomla]

Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-06 10:05:49+01:00, rafal@quant.(none) +1 -0
  WL#3327: Restore original Makefile.am as a restricted version wont compile on pushbuild.

  Makefile.am@stripped, 2007-03-06 10:05:45+01:00, rafal@quant.(none) +4 -11
    Revert to the original contents.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/backup/prototype

--- 1.119/Makefile.am	2007-03-06 10:05:59 +01:00
+++ 1.120/Makefile.am	2007-03-06 10:05:59 +01:00
@@ -24,17 +24,10 @@
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
 			@sql_union_dirs@ unittest storage plugin \
-			@sql_server@ scripts \
-			mysql-test \
-			@tools_dirs@ 
-
-# Removed subdirs
-#			win
-#			@man_dirs@ tests 
-#			netware 
-#			@libmysqld_dirs@ 
-#			support-files 
-#			sql-bench 
+			@sql_server@ scripts @man_dirs@ tests \
+			netware @libmysqld_dirs@ \
+			mysql-test support-files sql-bench @tools_dirs@ \
+			win
 
 DIST_SUBDIRS =		$(SUBDIRS) BUILD