bk commit into 5.0 tree (joerg:1.2489)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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-08-24 23:07:59+02:00, joerg@trift2. +2 -0
  Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0:
  
  1) Ensure "init_db.sql" and "test_db-sql" really get built.
  
  2) Ensure the "*.def" files with NetWare linker options get distributed to the proper
directories.

  netware/BUILD/compile-netware-END@stripped, 2007-08-24 23:07:55+02:00, joerg@trift2. +9 -2
    Ensure the "*.def" files are built for NetWare.
    
    This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
    the general "link_sources" step might fall victim to a cleanup which would be fatal
    just for NetWare, because of problems in the ordering of SUBDIR entries.

  netware/Makefile.am@stripped, 2007-08-24 23:07:55+02:00, joerg@trift2. +10 -4
    1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
    
    2) Use "basename", not sed.

diff -Nrup a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END
--- a/netware/BUILD/compile-netware-END	2006-10-24 11:16:51 +02:00
+++ b/netware/BUILD/compile-netware-END	2007-08-24 23:07:55 +02:00
@@ -29,8 +29,15 @@ fi
 # configure
 ./configure $base_configs $extra_configs
 
-# make
-make clean bin-dist
+# Ensure a clean tree
+make clean
+
+# Link NetWare specific .def files into their proper locations
+# in the source tree
+( cd netware && make link_sources )
+
+# Now, do the real build
+make bin-dist
 
 # mark the build
 for file in *.tar.gz *.zip
diff -Nrup a/netware/Makefile.am b/netware/Makefile.am
--- a/netware/Makefile.am	2007-05-02 14:01:46 +02:00
+++ b/netware/Makefile.am	2007-08-24 23:07:55 +02:00
@@ -40,13 +40,19 @@ netware_build_files =           client/m
                                 sql/mysqld.def extra/mysql_waitpid.def \
                                 extra/resolve_stack_dump.def myisam/myisam_ftdump.def
 
+BUILT_SOURCES =                 link_sources init_db.sql test_db.sql
+CLEANFILES = 			$(BUILT_SOURCES)
+
+all: $(BUILT_SOURCES)
+
 link_sources:
 	set -x; \
 	for f in $(netware_build_files); do \
 	  rm -f ../$$f; \
-	  org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
+	  org=`basename $$f`; \
 	  @LN_CP_F@ $(srcdir)/$$org ../$$f; \
 	done
+
 else
 
 BUILT_SOURCES =                 libmysql.imp init_db.sql test_db.sql
@@ -86,6 +92,8 @@ EXTRA_DIST=	$(BUILT_SOURCES) comp_err.de
 		BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \
 		BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch
 
+endif
+
 
 # Build init_db.sql from the files that contain
 # the system tables for this version of MySQL plus any commands
@@ -103,9 +111,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql
 test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
 	@echo "Building $@";
 	@cat init_db.sql \
-	     $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
-
-endif
+	     $(top_srcdir)/scripts/mysql_test_data_timezone.sql  > $@;
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%