Commit a556607b authored by unknown's avatar unknown

Use INSTALL_DATA instead of cp.

mysql.server is a script, not data.


Docs/Makefile.am:
  Use INSTALL_DATA instead of cp
libmysql/Makefile.am:
  Use INSTALL_DATA instead of cp
mysql-test/Makefile.am:
  Use INSTALL_DATA instead of cp
sql-bench/Makefile.am:
  Use INSTALL_DATA instead of cp
support-files/Makefile.am:
  mysql.server is a script, not data.
parent c1c2b959
...@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi ...@@ -115,8 +115,8 @@ manual_letter.ps: manual.texi include.texi
dist-hook: dist-hook:
BD=`cd $(top_srcdir); pwd`; \ BD=`cd $(top_srcdir); pwd`; \
if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \ if test ! -d $(distdir)/Flags; then mkdir -p $(distdir)/Flags; fi; \
cp -p $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps $(srcdir)/Flags/*.txt \ $(INSTALL_DATA) $(srcdir)/Flags/*.gif $(srcdir)/Flags/*.eps \
$(distdir)/Flags; $(srcdir)/Flags/*.txt $(distdir)/Flags;
echo "PostScript and PDF versions suitable for printing" \ echo "PostScript and PDF versions suitable for printing" \
> $(distdir)/manual.ps > $(distdir)/manual.ps
echo "are available from http://www.mysql.com/Manual/" \ echo "are available from http://www.mysql.com/Manual/" \
......
...@@ -80,8 +80,8 @@ do-lib-dist: ...@@ -80,8 +80,8 @@ do-lib-dist:
objs="$$objs1 $$objs2"; \ objs="$$objs1 $$objs2"; \
rm -rf $$dir; \ rm -rf $$dir; \
mkdir $$dir; \ mkdir $$dir; \
cp $$srcs $(mysysheaders) $$dir; \ $(INSTALL_DATA) $$srcs $(mysysheaders) $$dir; \
for i in $(nh); do cp ../include/$$i $$dir; done; \ for i in $(nh); do $(INSTALL_DATA) ../include/$$i $$dir; done; \
echo "# A very minimal Makefile to compile" > $$dir/Makefile; \ echo "# A very minimal Makefile to compile" > $$dir/Makefile; \
echo "# the minimized libmysql library" >> $$dir/Makefile; \ echo "# the minimized libmysql library" >> $$dir/Makefile; \
echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \ echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \
......
...@@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS) ...@@ -27,10 +27,10 @@ CLEANFILES = $(test_SCRIPTS)
dist-hook: dist-hook:
mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
$(distdir)/std_data $(distdir)/std_data
cp -p $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(distdir)/t
cp -p $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include
cp -p $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
cp -p $(srcdir)/std_data/*.dat $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(distdir)/std_data
install-data-local: install-data-local:
$(mkinstalldirs) \ $(mkinstalldirs) \
......
...@@ -37,13 +37,13 @@ dist-hook: ...@@ -37,13 +37,13 @@ dist-hook:
$(distdir)/Results $(distdir)/Results-linux \ $(distdir)/Results $(distdir)/Results-linux \
$(distdir)/Results-win32 \ $(distdir)/Results-win32 \
$(distdir)/limits $(distdir)/Comments $(distdir)/limits $(distdir)/Comments
cp -pr $(srcdir)/Data/ATIS $(distdir)/Data $(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data
cp -pr $(srcdir)/Data/Wisconsin $(distdir)/Data $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data
cp -pr $(srcdir)/Results $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/
cp -pr $(srcdir)/Results-linux $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/
cp -pr $(srcdir)/Results-win32 $(distdir)/ $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/
cp -pr $(srcdir)/limits $(distdir)/ $(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/
cp -pr $(srcdir)/Comments $(distdir)/ $(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/
install-data-local: install-data-local:
$(mkinstalldirs) \ $(mkinstalldirs) \
......
...@@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \ ...@@ -33,9 +33,10 @@ pkgdata_DATA = my-small.cnf \
my-huge.cnf \ my-huge.cnf \
mysql-log-rotate \ mysql-log-rotate \
mysql-@VERSION@.spec \ mysql-@VERSION@.spec \
mysql.server \
binary-configure binary-configure
pkgdata_SCRIPTS = mysql.server
CLEANFILES = my-small.cnf \ CLEANFILES = my-small.cnf \
my-medium.cnf \ my-medium.cnf \
my-large.cnf \ my-large.cnf \
......
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