mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
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.
This commit is contained in:
parent
6eaef0598f
commit
c8908b8fd1
3 changed files with 13 additions and 11 deletions
|
@ -97,7 +97,7 @@ sub main
|
||||||
# on the toplevel of the directory instead. file 'PUBLIC' shouldn't
|
# on the toplevel of the directory instead. file 'PUBLIC' shouldn't
|
||||||
# exist in the new mysql distributions, but let's be sure..
|
# exist in the new mysql distributions, but let's be sure..
|
||||||
`rm -f $destdir/PUBLIC`;
|
`rm -f $destdir/PUBLIC`;
|
||||||
`cp -a $WD/Docs/LICENSE $destdir/`;
|
`cp -p $WD/Docs/LICENSE $destdir/`;
|
||||||
|
|
||||||
# fix file copyrights
|
# fix file copyrights
|
||||||
&fix_usage_copyright();
|
&fix_usage_copyright();
|
||||||
|
|
|
@ -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
|
||||||
$(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data
|
$(INSTALL_DATA) $(srcdir)/Data/ATIS/*.* $(distdir)/Data/ATIS
|
||||||
$(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data
|
$(INSTALL_DATA) $(srcdir)/Data/Wisconsin/*.* $(distdir)/Data/Wisconsin
|
||||||
$(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/
|
$(INSTALL_DATA) $(srcdir)/Results/*-* $(distdir)/Results
|
||||||
$(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/
|
$(INSTALL_DATA) $(srcdir)/Results-linux/*-* $(distdir)/Results-linux
|
||||||
$(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/
|
$(INSTALL_DATA) $(srcdir)/Results-win32/*-* $(distdir)/Results-win32
|
||||||
$(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/
|
$(INSTALL_DATA) $(srcdir)/limits/*.* $(distdir)/limits
|
||||||
$(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/
|
$(INSTALL_DATA) $(srcdir)/Comments/*.* $(distdir)/Comments
|
||||||
|
|
||||||
install-data-local:
|
install-data-local:
|
||||||
$(mkinstalldirs) \
|
$(mkinstalldirs) \
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
## Process this file with automake to create Makefile.in
|
## Process this file with automake to create Makefile.in
|
||||||
|
|
||||||
# This requires gnu cp at distribution time.
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
for lang in @AVAILABLE_LANGUAGES@ charsets; \
|
for dir in charsets @AVAILABLE_LANGUAGES@; do \
|
||||||
do cp -a $(srcdir)/$$lang $(distdir); done
|
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@
|
all: @AVAILABLE_LANGUAGES_ERRORS@
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue