Commit ac7f0f98 authored by unknown's avatar unknown

Merge trift2.:/MySQL/M50/netware2-5.0

into  trift2.:/MySQL/M50/push-5.0


netware/Makefile.am:
  Auto merged
parents 7d65f9e8 4a801dde
......@@ -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
......
......@@ -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.%
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment