summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-02-12 18:28:35 +0200
committerGeorgi Kodinov <joro@sun.com>2010-02-12 18:28:35 +0200
commit792fc9f7844575675206f873a0fa1d6e7fb8ad4f (patch)
tree77d9d42655f4fa3afa8bb69d7aa15e174b617cad /scripts
parent6f78ef71d485fb3968355941860d012fc17a9c59 (diff)
downloadmariadb-git-792fc9f7844575675206f873a0fa1d6e7fb8ad4f.tar.gz
Bug #35250: readline check breaks when doing vpath build
Fixed several (obvious) places that don't work with vpath build.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0292617c7a5..1aa24c5d432 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -110,7 +110,8 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh
mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
mysql_system_tables_fix.sql
@echo "Building $@";
- @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
+ @cat $(srcdir)/mysql_system_tables.sql \
+ $(srcdir)/mysql_system_tables_fix.sql > $@
#
# Build mysql_fix_privilege_tables_sql.c from
@@ -123,7 +124,7 @@ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
sleep 2
$(top_builddir)/scripts/comp_sql$(EXEEXT) \
mysql_fix_privilege_tables \
- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
SUFFIXES = .sh