diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-02-05 21:58:20 -0500 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-02-05 21:58:20 -0500 |
| commit | c8908b8fd1d23b9b5fd5681b018c1bebe1957a32 (patch) | |
| tree | 136e517705a178136a96d23b2026a02d9d18fb79 | |
| parent | 6eaef0598fba2348c1170b5d88743d9352316f5f (diff) | |
| download | mariadb-git-c8908b8fd1d23b9b5fd5681b018c1bebe1957a32.tar.gz | |
Remove several uses of cp -a, and fix broken dist-hook in sql-bench.
Build-tools/mysql-copyright:
remove use of cp -a.
sql-bench/Makefile.am:
fix broken dist-hook target (brain-o)
sql/share/Makefile.am:
remove use of cp -a.
| -rwxr-xr-x | Build-tools/mysql-copyright | 2 | ||||
| -rw-r--r-- | sql-bench/Makefile.am | 14 | ||||
| -rw-r--r-- | sql/share/Makefile.am | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index f481325bebb..df819b20fa1 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -97,7 +97,7 @@ sub main # on the toplevel of the directory instead. file 'PUBLIC' shouldn't # exist in the new mysql distributions, but let's be sure.. `rm -f $destdir/PUBLIC`; - `cp -a $WD/Docs/LICENSE $destdir/`; + `cp -p $WD/Docs/LICENSE $destdir/`; # fix file copyrights &fix_usage_copyright(); diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am index 58369313054..5dc3e0b4e42 100644 --- a/sql-bench/Makefile.am +++ b/sql-bench/Makefile.am @@ -37,13 +37,13 @@ dist-hook: $(distdir)/Results $(distdir)/Results-linux \ $(distdir)/Results-win32 \ $(distdir)/limits $(distdir)/Comments - $(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) $(srcdir)/Data/ATIS/*.* $(distdir)/Data/ATIS + $(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data/Wisconsin + $(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/Results + $(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/Results-linux + $(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/Results-win32 + $(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/limits + $(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/Comments install-data-local: $(mkinstalldirs) \ diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 0caca9afdfb..88913631c3c 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -1,9 +1,11 @@ ## Process this file with automake to create Makefile.in -# This requires gnu cp at distribution time. dist-hook: - for lang in @AVAILABLE_LANGUAGES@ charsets; \ - do cp -a $(srcdir)/$$lang $(distdir); done + for dir in charsets @AVAILABLE_LANGUAGES@; do \ + test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \ + $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \ + done; \ + $(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets; \ all: @AVAILABLE_LANGUAGES_ERRORS@ |