Commit 9a864bb7 authored by unknown's avatar unknown
Browse files

Fix problems with "make dist" and running from "binary dist" 


mysql-test/Makefile.am:
  Add missing ($DESTDIR) wich cause "make discheck" to fail
scripts/make_binary_distribution.sh:
  Add std_data/*.MY* files to binary dist
parent d5e094d7

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/t 
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \

    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf \

    mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \

    $BASE/mysql-test/std_data

$CP mysql-test/t/*.test mysql-test/t/*.imtest \

    mysql-test/t/*.disabled mysql-test/t/*.opt \