diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 30852ba567124dc2868ecdcc52d048a4c9dc6041..d7fab3940f2aa6a4e865ebaff22fd44fc4963a91 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -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
 
diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am
index 278ea5169107fffd35dfd5c7ff7505ac5de6cb91..27d7c7be0d49c0bf232175997cfd6c69fd3f27b1 100644
--- a/sql-bench/Makefile.am
+++ b/sql-bench/Makefile.am
@@ -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
 
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index 2f1440597dc488a864c4f2a8af673d18ff8aa1a4..9bbcf6668dae3c63d2399bac8134483075821eec 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -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