diff options
| author | unknown <joerg@mysql.com> | 2004-10-25 22:15:45 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-10-25 22:15:45 +0200 |
| commit | 2df0eca2b6642dd6779e1db16f3ceb26aaf0db76 (patch) | |
| tree | 8357b41eb87509fbb7ce0c416d0ad0ca0dfe3003 /Build-tools | |
| parent | 3dee030ff92d504f8ce1ce903865e735e5202f1d (diff) | |
| download | mariadb-git-2df0eca2b6642dd6779e1db16f3ceb26aaf0db76.tar.gz | |
Change 'Build-tools/mysql-copyright' to ensure the receiving machines will build
without trying to re-run autotools.
Build-tools/mysql-copyright:
The top level Makefile will try to re-run the autotools unless the timestamps of the
relevant files are in truly ascending order. Ensure this order!
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/mysql-copyright | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index dbb18e4e866..81d6d761498 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -3,7 +3,7 @@ # Untar a MySQL distribution, change the copyright texts, # pack it up again to a given directory -$VER="1.4"; +$VER="1.5"; use Cwd; use File::Basename; @@ -134,7 +134,6 @@ sub main # remove temporary directory chdir($WD) or print "$! Unable to move up one dir\n"; - `cd $WD`; my $cwd = getcwd(); print "current dir is $cwd\n" if $opt_verbose ; if (-e $dir) { @@ -231,7 +230,14 @@ sub run_autotools # File "configure.in" has already been modified by "trim_the_fat()" - `aclocal && autoheader && aclocal && automake && autoconf`; + # It must be ensured that the timestamps of the relevant files are really + # ascending, for otherwise the Makefile may cause a re-run of these + # autotools. Experience shows that deletion is the only safe way. + unlink ("config.h.in") or die "Can't delete $destdir/config.h.in: $!\n"; + unlink ("aclocal.m4") or die "Can't delete $destdir/aclocal.m4: $!\n"; + + # These sleep commands also ensure the ascending order. + `aclocal && sleep 2 && autoheader && sleep 2 && automake && sleep 2 && autoconf`; die "'./configure' was not produced!" unless (-f "configure"); if (-d "autom4te.cache") { |