Merge trift2.:/MySQL/M50/netware-cross-5.0

into  trift2.:/MySQL/M51/netware-cross-5.1


scripts/Makefile.am:
  Manual merge.

scripts/Makefile.am

@@ -62,7 +62,6 @@ EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
 			mysqlbug \
 			make_win_bin_dist \
-			mysql_fix_privilege_tables.sql \
 			mysql_fix_privilege_tables_sql.c \
 			mysql_system_tables_fix.sql \
 			CMakeLists.txt
@@ -89,13 +88,11 @@ CLEANFILES =		@server_scripts@ \
 			mysqlhotcopy \
 			mysqldumpslow \
 			mysql_tableinfo \
-			mysqld_multi \
-			mysql_fix_privilege_tables.sql \
-			mysql_fix_privilege_tables_sql.c
+			mysqld_multi
 
 # mysqlbug should be distributed built so that people can report build
 # failures with it.
-DISTCLEANFILES =        mysqlbug
+DISTCLEANFILES =        $(BUILT_SOURCES) mysqlbug
 
 # We want the right version and configure comand line in mysqlbug
 mysqlbug: ${top_builddir}/config.status mysqlbug.sh
@@ -111,9 +108,12 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 #
 # Build mysql_fix_privilege_tables_sql.c from
 # mysql_fix_privileges_tables.sql using comp_sql
+# The "sleep" ensures the generated file has a younger timestamp than its source
+# (which may have been generated in this very same "make" run).
 #
 mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
 	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
+	sleep 2
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@