diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-22 08:57:52 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-22 08:57:52 +0000 |
| commit | d2cdceb2aad0fdc35820993420d5b8d30c56bb3f (patch) | |
| tree | 2b67082eb89c6241c8edc4669d2c56489bddcca4 /scripts | |
| parent | ce91fb2f899182b3bcdd53f460de1762855a609e (diff) | |
| download | mariadb-git-d2cdceb2aad0fdc35820993420d5b8d30c56bb3f.tar.gz | |
use the right make in make_binary_distribution
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d4da77d0387..4158b5a34dc 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -139,6 +139,7 @@ SUFFIXES = .sh -e 's!@''IS_LINUX''@!@IS_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ + -e "s!@MAKE@!$(MAKE)!" \ $< > $@-t @CHMOD@ +x $@-t @MV@ $@-t $@ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 9af7913999f..281ef9bd469 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -267,8 +267,8 @@ fi # NDB Cluster if [ x$NDBCLUSTER = x1 ]; then - ( cd ndb ; make DESTDIR=$BASE/ndb-stage install ) - ( cd mysql-test/ndb ; make DESTDIR=$BASE/ndb-stage install ) + ( cd ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) + ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install ) $CP $BASE/ndb-stage@bindir@/* $BASE/bin/. $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/. $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/. |