summaryrefslogtreecommitdiff
path: root/mysys/Makefile.am
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-11-19 12:35:17 +0200
committerunknown <monty@mashka.mysql.fi>2002-11-19 12:35:17 +0200
commit33d678fcdc2d0b431c0f08e11e0b6715cd37cda0 (patch)
treee3b0f252f2776f41e8db495a24048a795b9019f4 /mysys/Makefile.am
parent54c03ff73630ce782d3c982003989b12a3fa5728 (diff)
parent7bc917e9e12c4be30628a09a56f75c6e0a669802 (diff)
downloadmariadb-git-33d678fcdc2d0b431c0f08e11e0b6715cd37cda0.tar.gz
merge with 3.23
BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-depcomp: Delete: depcomp config.guess: Auto merged config.sub: Auto merged configure.in: Auto merged dbug/Makefile.am: Auto merged heap/Makefile.am: Auto merged install-sh: Auto merged isam/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged ltconfig: Auto merged ltmain.sh: Auto merged missing: Auto merged myisam/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/mf_keycache.c: Auto merged regex/Makefile.am: Auto merged sql/Makefile.am: Auto merged strings/Makefile.am: Auto merged
Diffstat (limited to 'mysys/Makefile.am')
-rw-r--r--mysys/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 9fea00e23e8..6047debcaf5 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -100,7 +100,7 @@ test_io_cache: mf_iocache.c $(LIBRARIES)
test_dir: test_dir.c $(LIBRARIES)
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
-test_charset: test_charset.c $(LIBRARIES)
+test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
testhash: testhash.c $(LIBRARIES)