diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-11 20:30:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-23 13:52:31 +0200 |
| commit | 8d3d114ce0ea43f9f35de73fa488fbaafacf86b2 (patch) | |
| tree | 5f2e16217f78d6a2f650182fa2e4dcb2cdda3125 | |
| parent | b4e3bc97600e8738f79a6046e58dc2933a9d8314 (diff) | |
| download | ptxdist-8d3d114ce0ea43f9f35de73fa488fbaafacf86b2.tar.gz ptxdist-8d3d114ce0ea43f9f35de73fa488fbaafacf86b2.tar.xz | |
[mysql] really install host-mysql stuff and use it in mysql
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-mysql.make | 3 | ||||
| -rw-r--r-- | rules/mysql.make | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/rules/host-mysql.make b/rules/host-mysql.make index dc4227b3c..9a000b011 100644 --- a/rules/host-mysql.make +++ b/rules/host-mysql.make @@ -64,6 +64,9 @@ $(STATEDIR)/host-mysql.compile: $(STATEDIR)/host-mysql.install: @$(call targetinfo) + @install -m 755 -D $(HOST_MYSQL_DIR)/extra/comp_err $(HOST_MYSQL_PKGDIR)/bin/comp_err + @install -m 755 -D $(HOST_MYSQL_DIR)/sql/gen_lex_hash $(HOST_MYSQL_PKGDIR)/bin/gen_lex_hash + @install -m 755 -D $(HOST_MYSQL_DIR)/dbug/factorial $(HOST_MYSQL_PKGDIR)/bin/factorial @$(call touch) # vim: syntax=make diff --git a/rules/mysql.make b/rules/mysql.make index 37a247c87..785580aa8 100644 --- a/rules/mysql.make +++ b/rules/mysql.make @@ -37,19 +37,15 @@ $(MYSQL_SOURCE): # Prepare # ---------------------------------------------------------------------------- -MYSQL_PATH := PATH=$(HOST_MYSQL_DIR)/extra:$(HOST_MYSQL_DIR)/sql:$(CROSS_PATH) - -# no := here, please! -MYSQL_ENV = \ +MYSQL_ENV := \ $(CROSS_ENV) \ - ac_cv_path_COMP_ERR=$(HOST_MYSQL_DIR)/extra/comp_err \ - ac_cv_path_GEN_LEX_HASH=$(HOST_MYSQL_DIR)/sql/gen_lex_hash + ac_cv_path_COMP_ERR=$(PTXCONF_SYSROOT_HOST)/bin/comp_err \ + ac_cv_path_GEN_LEX_HASH=$(PTXCONF_SYSROOT_HOST)/bin/gen_lex_hash # # autoconf # MYSQL_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-build-mysql=$(HOST_MYSQL_DIR) \ --without-extra-tools \ --with-zlib-dir=$(SYSROOT)/usr \ --without-debug |