Commit bcd6abea authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Use INSTALL_DATA instead of cp. 

mysql.server is a script, not data.
parent a066832c

Docs/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi 
dist-hook:

	BD=`cd $(top_srcdir); pwd`; \

	if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \

	cp -p $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps $(srcdir)/Flags/*.txt \

		$(distdir)/Flags;

	$(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \

		$(srcdir)/Flags/*.txt $(distdir)/Flags;

	echo "PostScript and PDF versions suitable for printing" \

		> $(distdir)/manual.ps

	echo "are available from http://www.mysql.com/Manual/" \

libmysql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ do-lib-dist: 
	objs="$$objs1 $$objs2"; \

	rm -rf $$dir; \

	mkdir $$dir; \

	cp $$srcs $(mysysheaders) $$dir; \

	for i in $(nh); do cp ../include/$$i $$dir; done; \

	$(INSTALL_DATA) $$srcs $(mysysheaders) $$dir; \

	for i in $(nh); do $(INSTALL_DATA) ../include/$$i $$dir; done; \

	echo "# A very minimal Makefile to compile" > $$dir/Makefile; \

	echo "# the minimized libmysql library" >> $$dir/Makefile; \

	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \

mysql-test/Makefile.am

+4 −4
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS) 
dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data

	cp -p $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t

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

	cp -p $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

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

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

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



install-data-local:

	$(mkinstalldirs) \

sql-bench/Makefile.am

+7 −7
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ dist-hook: 
		 $(distdir)/Results $(distdir)/Results-linux \

		 $(distdir)/Results-win32 \

		 $(distdir)/limits $(distdir)/Comments

	cp -pr $(srcdir)/Data/ATIS $(distdir)/Data

	cp -pr $(srcdir)/Data/Wisconsin $(distdir)/Data

	cp -pr $(srcdir)/Results $(distdir)/

	cp -pr $(srcdir)/Results-linux $(distdir)/

	cp -pr $(srcdir)/Results-win32 $(distdir)/

	cp -pr $(srcdir)/limits $(distdir)/

	cp -pr $(srcdir)/Comments $(distdir)/

	$(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data

	$(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data

	$(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/

	$(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/

	$(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/

	$(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/

	$(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/



install-data-local:

	$(mkinstalldirs) \

support-files/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \ 
			my-huge.cnf \

			mysql-log-rotate \

			mysql-@VERSION@.spec \

			mysql.server \

			binary-configure



pkgdata_SCRIPTS =	mysql.server



CLEANFILES =		my-small.cnf \

			my-medium.cnf \

			my-large.cnf \