summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-04-30 20:29:57 +0200
committerunknown <joerg@trift2.>2007-04-30 20:29:57 +0200
commit8cf38a1c1bcbccc134958b4a32baa180c5557466 (patch)
tree7a07e1542108ef050f272c2f60fd6e398cbb788f /scripts/Makefile.am
parent78ab9a9b7b999e5bc48cf265a6f6c3f414009e81 (diff)
parenta4a0faf4fd9df92cc2d498b93acd5b359cd3bc78 (diff)
downloadmariadb-git-8cf38a1c1bcbccc134958b4a32baa180c5557466.tar.gz
Merge trift2.:/MySQL/M50/netware-cross-5.0
into trift2.:/MySQL/M51/netware-cross-5.1 scripts/Makefile.am: Auto merged
Diffstat (limited to 'scripts/Makefile.am')
-rw-r--r--scripts/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9d344118f2b..f4b076a6f35 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