summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-05-02 17:15:48 +0200
committerunknown <joerg@trift2.>2007-05-02 17:15:48 +0200
commitb29d3457a6e9e44badaf884dc21210dcc914a808 (patch)
treebebd3598eee184810dfcbc8e452afb570fd2d11d /scripts/Makefile.am
parent4e95b9dc3b44ea6bb4219ca23bb324a782f56525 (diff)
parentc2dc7d92ac854d4c4f40b73f5836448dbf2280fb (diff)
downloadmariadb-git-b29d3457a6e9e44badaf884dc21210dcc914a808.tar.gz
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0 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 97691318cc6..cb0658f8756 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 \
@@ -70,6 +70,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