Commit ba419bdc authored by dfischer/mysqldev@mysql.com/production.mysql.com's avatar dfischer/mysqldev@mysql.com/production.mysql.com
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
parents 81528c1a 516cafdc

netware/BUILD/compile-netware-END

+9 −2
Original line number Diff line number Diff line
@@ -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

netware/Makefile.am

+9 −3
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ 
                                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 \
@@ -47,6 +52,7 @@ link_sources: 
	  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.def install_test_db.ncf \ 
		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_system_tables.sql \ 
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.%