diff options
| author | tim@threads.polyesthetic.msg <> | 2001-03-05 21:08:24 -0500 |
|---|---|---|
| committer | tim@threads.polyesthetic.msg <> | 2001-03-05 21:08:24 -0500 |
| commit | 853a2f01604b17b4611778d89bf178ccee3901c3 (patch) | |
| tree | 3902f4507a29057e8bac5e5a04bb2d1e73e5e8d1 | |
| parent | 9bbe517965a7d75fd5999934e3566726c6e2812f (diff) | |
| download | mariadb-git-853a2f01604b17b4611778d89bf178ccee3901c3.tar.gz | |
Make sure ib_config.h is distributed.
Clean up Do-all-build-steps.
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 19 | ||||
| -rw-r--r-- | innobase/Makefile.am | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index f7f34afd1b5..2938edf2b01 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -1,8 +1,16 @@ -#!/bin/bash +#!/bin/sh WD=`pwd` # Don't write a wrong path for BD !!!!! -BD=/my/tmp/BUILD +if [ -w /my/tmp ] +then + BD=/my/tmp/BUILD +elif [ -n "$TMPDIR" ] +then + BD=$TMPDIR/BUILD +else + BD=/tmp/BUILD +fi TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$ # We build on work @@ -76,15 +84,18 @@ sh $BD/Build-tools/Do-rpm rm -f $TMP_SCRIPT END +set -e + log=$WD/Logs/Log-distcheck-`date +%y%m%d-%H%M` +echo "Logging script $TMP_SCRIPT into $log" if test $to_host = "mysql-work" then # Try to get the right user for MySQL builds on work so that all # files is owned by the same user (mysql) - ssh -n $to_host -l my "time bash $TMP_SCRIPT" > $log 2>&1 + ssh -n $to_host -l my "time sh $TMP_SCRIPT" > $log 2>&1 else - time bash $TMP_SCRIPT > $log 2>&1 + time sh $TMP_SCRIPT > $log 2>&1 fi # Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from diff --git a/innobase/Makefile.am b/innobase/Makefile.am index e441b31aef0..cc4ce312d8d 100644 --- a/innobase/Makefile.am +++ b/innobase/Makefile.am @@ -20,6 +20,8 @@ AUTOMAKE_OPTIONS = foreign TAR = gtar +noinst_HEADERS = ib_config.h + SUBDIRS = os ut btr buf com data dict dyn eval fil fsp fut \ ha ibuf include lock log mach mem mtr odbc page \ pars que read rem row srv sync thr trx usr |