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

Remove several uses of cp -a, and fix broken dist-hook in sql-bench.

parent 86b3263d

Build-tools/mysql-copyright

+1 −1
Original line number Diff line number Diff line
@@ -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();

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

	$(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) \

sql/share/Makefile.am

+5 −3
Original line number Diff line number Diff line 
## 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@