diff options
| author | joerg@trift2. <> | 2007-08-24 23:07:59 +0200 |
|---|---|---|
| committer | joerg@trift2. <> | 2007-08-24 23:07:59 +0200 |
| commit | 2fd45aaee643694820b133c4145fa086302e8c75 (patch) | |
| tree | dad6764618b2ecdf7a17ad7942061e3d4f8a5ca1 /netware | |
| parent | 01ad4893562aff4bad9ce94285942e8405034ebb (diff) | |
| download | mariadb-git-2fd45aaee643694820b133c4145fa086302e8c75.tar.gz | |
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.
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-netware-END | 11 | ||||
| -rw-r--r-- | netware/Makefile.am | 14 |
2 files changed, 19 insertions, 6 deletions
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END index 6c531ab5c7c..bf712f09162 100755 --- a/netware/BUILD/compile-netware-END +++ b/netware/BUILD/compile-netware-END @@ -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 --git a/netware/Makefile.am b/netware/Makefile.am index 3ec9c7794bf..296b5a391c4 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -40,13 +40,19 @@ 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 \ 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.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.% |