summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-05-02 17:19:30 +0200
committerunknown <joerg@trift2.>2007-05-02 17:19:30 +0200
commit11b49c6c401901bbab6561cdb99772601c545e59 (patch)
treed962cb9f6266e98b1fb6a0cc4a86cc0e87a8ec53 /scripts
parentaeeac397e9a195fccd51103676a90fe565604f6f (diff)
parentad8c198138e202f5c25f6555447cd969ec4f3640 (diff)
downloadmariadb-git-11b49c6c401901bbab6561cdb99772601c545e59.tar.gz
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1 scripts/Makefile.am: Auto merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3475e322e6e..04ed57a0cd7 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -18,7 +18,7 @@
BUILT_SOURCES = mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c
-noinst_PROGRAMS = comp_sql
+EXTRA_PROGRAMS = comp_sql
bin_SCRIPTS = @server_scripts@ \
msql2mysql \
@@ -62,6 +62,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \
mysqlaccess.conf \
mysqlbug \
make_win_bin_dist \
+ mysql_fix_privilege_tables.sql \
+ mysql_fix_privilege_tables_sql.c \
mysql_system_tables_fix.sql \
CMakeLists.txt