fix 4.1 build

c72a7a8d · bell@sanja.is.com.ua · 91c8660c · c72a7a8d · c72a7a8d · c72a7a8d
Commit c72a7a8d authored Oct 14, 2002 by bell@sanja.is.com.ua
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

BUILD/FINISH.sh BUILD/FINISH.sh +2 -1

configure.in configure.in +1 -1

mysys/Makefile.am mysys/Makefile.am +1 -1

No files found.
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -14,7 +14,8 @@ $make -k clean || true
 /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
 aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
+# TODO: remove when DBD will be OK
+#(cd bdb/dist && sh s_all)
 (cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
 if [ -d gemini ]
 then

--- a/configure.in
+++ b/configure.in
@@ -2368,7 +2368,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
 os2/Makefile os2/include/Makefile os2/include/sys/Makefile \
 man/Makefile BUILD/Makefile readline/Makefile vio/Makefile \
 libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
- libmysql/Makefile client/Makefile os2/Makefile \
+ libmysql/Makefile client/Makefile \
 pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
 merge/Makefile dbug/Makefile scripts/Makefile \
 include/Makefile sql-bench/Makefile tools/Makefile \

--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -105,7 +105,7 @@ test_dir: test_dir.c $(LIBRARIES)
 test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
-charset2html: charset2html.c $(LIBRARIES)
+charset2html$(EXEEXT): charset2html.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/charset2html.c $(LDADD) $(LIBS)
 testhash: testhash.c $(LIBRARIES)