Commit e64b12a0 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents e7d38741 faeb9896

mysql-test/Makefile.am

+6 −6
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ install-data-local: 
		$(DESTDIR)$(testdir)/r \

		$(DESTDIR)$(testdir)/include \

		$(DESTDIR)$(testdir)/std_data

	cp -p $(srcdir)/README $(DESTDIR)$(testdir)

	cp -p $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	cp -p $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	cp -p $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	cp -p $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	cp -p $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

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



SUFFIXES = .sh

sql-bench/Makefile.am

+8 −8
Original line number Diff line number Diff line
@@ -55,14 +55,14 @@ install-data-local: 
		 $(DESTDIR)$(benchdir)/Results-win32 \

		 $(DESTDIR)$(benchdir)/limits \

		 $(DESTDIR)$(benchdir)/Comments

	cp -p  $(srcdir)/README  $(DESTDIR)$(benchdir)

	cp -pr $(srcdir)/Data/ATIS  $(DESTDIR)$(benchdir)/Data

	cp -pr $(srcdir)/Data/Wisconsin  $(DESTDIR)$(benchdir)/Data

	cp -pr $(srcdir)/Results  $(DESTDIR)$(benchdir)

	cp -pr $(srcdir)/Results-linux  $(DESTDIR)$(benchdir)

	cp -pr $(srcdir)/Results-win32  $(DESTDIR)$(benchdir)

	cp -pr $(srcdir)/limits  $(DESTDIR)$(benchdir)

	cp -pr $(srcdir)/Comments  $(DESTDIR)$(benchdir)

	$(INSTALL_DATA) $(srcdir)/README  $(DESTDIR)$(benchdir)

	$(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(DESTDIR)$(benchdir)/Data/ATIS

	$(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(DESTDIR)$(benchdir)/Data/Wisconsin

	$(INSTALL_DATA) $(srcdir)/Results/*-* $(DESTDIR)$(benchdir)/Results

	$(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(DESTDIR)$(benchdir)/Results-linux

	$(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(DESTDIR)$(benchdir)/Results-win32

	$(INSTALL_DATA) $(srcdir)/limits/*.* $(DESTDIR)$(benchdir)/limits

	$(INSTALL_DATA) $(srcdir)/Comments/*.* $(DESTDIR)$(benchdir)/Comments



SUFFIXES = .sh

sql/share/Makefile.am

+3 −5
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ install-data-local: 
			        $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.txt; \

	done

	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets

	(for f in $(srcdir)/charsets/Index $(srcdir)/charsets/README $(srcdir)/charsets/*.conf; \

	do \

		n=`basename $$f`; \

		$(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/charsets/$$n; \

	done)
 
	$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README

	$(INSTALL_DATA) $(srcdir)/charsets/Index $(DESTDIR)$(pkgdatadir)/charsets/Index

	$(INSTALL_DATA) $(srcdir)/charsets/*.conf $(DESTDIR)$(pkgdatadir)/charsets