mysql-am15.patch

   1 diff -Nru mysql-3.23.49/Docs/Makefile.am mysql-3.23.49.new/Docs/Makefile.am
   2 --- mysql-3.23.49/Docs/Makefile.am      Tue Sep 11 14:28:23 2001
   3 +++ mysql-3.23.49.new/Docs/Makefile.am  Tue Sep 11 14:19:11 2001
   4 @@ -11,7 +11,6 @@
   5
   6  TEXI2HTML_FLAGS =      -iso -number
   7  DVIPS =                        dvips
   8 -MAKEINFO =             @MAKEINFO@
   9  TEXINFO_TEX =          Support/texinfo.tex
  10
  11  noinst_SCRIPTS =       Support/texi2html Support/generate-text-files.pl \
  12 @@ -55,7 +55,7 @@
  13         $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
  14
  15  manual.html:   manual.texi include.texi $(srcdir)/Support/texi2html
  16 -       cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
  17 +       cd $(srcdir) && $(PERL) $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
  18
  19  manual_toc.html: manual.html
  20
  21 --- mysql-3.23.51/Makefile.am.orig      Mon Jun  3 12:39:02 2002
  22 +++ mysql-3.23.51/Makefile.am   Thu Jun 13 00:38:01 2002
  23 @@ -21,10 +21,10 @@
  24  # These are built from source in the Docs directory
  25  EXTRA_DIST =           INSTALL-SOURCE README \
  26                         COPYING COPYING.LIB MIRRORS
  27 -SUBDIRS =              include @docs_dirs@ @readline_dir@ \
  28 -                       @thread_dirs@ @sql_client_dirs@ \
  29 -                       @sql_server_dirs@ scripts tests man \
  30 -                       @bench_dirs@ support-files os2
  31 +SUBDIRS =              include $(docs_dirs) $(readline_dir) \
  32 +                       $(thread_dirs) $(sql_client_dirs) \
  33 +                       $(sql_server_dirs) scripts tests man \
  34 +                       $(bench_dirs) support-files os2
  35
  36  # Relink after clean
  37  CLEANFILES =           linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources
  38 @@ -36,7 +36,7 @@
  39         cd include; $(MAKE) link_sources
  40         echo timestamp > linked_include_sources
  41
  42 -linked_client_sources:  @linked_client_targets@
  43 +linked_client_sources:  $(linked_client_targets)
  44         cd client; $(MAKE) link_sources
  45         echo timestamp > linked_client_sources
  46
  47 @@ -50,7 +50,7 @@
  48
  49  #avoid recursive make calls in sql directory
  50  linked_server_sources:
  51 -       cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
  52 +       cd sql; rm -f mini_client_errors.c;$(LN_CP_F) ../libmysql/errmsg.c mini_client_errors.c
  53         echo timestamp > linked_server_sources
  54
  55  # Create permission databases
  56 --- mysql-3.23.48/client/Makefile.am.orig       Thu Feb  7 21:46:47 2002
  57 +++ mysql-3.23.48/client/Makefile.am    Wed Feb 13 20:19:00 2002
  58 @@ -19,28 +19,18 @@
  59  INCLUDES =                     -I$(srcdir)/../include \
  60                                 -I../include -I$(srcdir)/.. -I$(top_srcdir) \
  61                                 -I..
  62 -LIBS =                         @CLIENT_LIBS@
  63 -LDADD =                                @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
  64 +LIBS =                         $(CLIENT_LIBS)
  65 +LDADD =                                $(CLIENT_EXTRA_LDFLAGS) ../libmysql/libmysqlclient.la
  66  bin_PROGRAMS =                 mysql mysqladmin mysqlcheck mysqlshow \
  67   mysqldump mysqlimport mysqltest mysqlbinlog
  68  noinst_PROGRAMS =              insert_test select_test thread_test
  69  noinst_HEADERS =               sql_string.h completion_hash.h my_readline.h \
  70                                 client_priv.h
  71  mysql_SOURCES =                        mysql.cc readline.cc sql_string.cc completion_hash.cc
  72 -mysql_LDADD =                  @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
  73 +mysql_LDADD =                  $(readline_link) $(TERMCAP_LIB) $(LDADD) $(CXXLDFLAGS)
  74  mysqlbinlog_LDADD =            $(LDADD) $(CXXLDFLAGS)
  75 -mysql_DEPENDENCIES=            $(LIBRARIES) $(pkglib_LTLIBRARIES)
  76 -mysqladmin_DEPENDENCIES=       $(LIBRARIES) $(pkglib_LTLIBRARIES)
  77 -mysqlcheck_DEPENDENCIES=       $(LIBRARIES) $(pkglib_LTLIBRARIES)
  78 -mysqlshow_DEPENDENCIES=                $(LIBRARIES) $(pkglib_LTLIBRARIES)
  79 -mysqldump_DEPENDENCIES=                $(LIBRARIES) $(pkglib_LTLIBRARIES)
  80 -mysqlimport_DEPENDENCIES=      $(LIBRARIES) $(pkglib_LTLIBRARIES)
  81 -insert_test_DEPENDENCIES=      $(LIBRARIES) $(pkglib_LTLIBRARIES)
  82 -select_test_DEPENDENCIES=      $(LIBRARIES) $(pkglib_LTLIBRARIES)
  83  mysqltest_SOURCES=                     mysqltest.c
  84 -mysqltest_DEPENDENCIES=        $(LIBRARIES) $(pkglib_LTLIBRARIES)
  85  mysqlbinlog_SOURCES =   mysqlbinlog.cc
  86 -mysqlbinlog_DEPENDENCIES=      $(LIBRARIES) $(pkglib_LTLIBRARIES)
  87  sql_src=log_event.h log_event.cc
  88
  89  # Fix for mit-threads
  90 @@ -49,11 +39,11 @@
  91  link_sources:
  92         for f in $(sql_src) ; do \
  93           rm -f $(srcdir)/$$f; \
  94 -         @LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
  95 +         $(LN_CP_F) $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
  96          done;
  97
  98  thread_test.o:         thread_test.c
  99 -                       $(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $<
 100 +                       $(COMPILE) -c $(MT_INCLUDES) $(INCLUDES) $<
 101
 102  # Don't update the files from bitkeeper
 103  %::SCCS/s.%
 104 diff -Nru mysql-3.23.49/configure.in mysql-3.23.49.new/configure.in
 105 --- mysql-3.23.49/configure.in  Tue Sep 11 14:28:24 2001
 106 +++ mysql-3.23.49.new/configure.in      Tue Sep 11 14:19:11 2001
 107 @@ -83,6 +83,7 @@
 108  AC_SUBST(SAVE_LDFLAGS)
 109  AC_SUBST(SAVE_CXXLDFLAGS)
 110  AC_SUBST(CXXLDFLAGS)
 111 +AM_PROG_AS
 112
 113  AC_PREREQ(2.12)dnl             Minimum Autoconf version required.
 114
 115 diff -Nru mysql-3.23.49/dbug/Makefile.am mysql-3.23.49.new/dbug/Makefile.am
 116 --- mysql-3.23.49/dbug/Makefile.am      Tue Sep 11 14:28:24 2001
 117 +++ mysql-3.23.49.new/dbug/Makefile.am  Tue Sep 11 14:19:11 2001
 118 @@ -15,8 +15,8 @@
 119  # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 120  # MA 02111-1307, USA
 121
 122 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 123 -LDADD =                        libdbug.a ../strings/libmystrings.a
 124 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 125 +LDADD =                        libdbug.a $(top_builddir)/strings/libmystrings.a
 126  pkglib_LIBRARIES =     libdbug.a
 127  noinst_HEADERS =       dbug_long.h
 128  libdbug_a_SOURCES =    dbug.c sanity.c
 129 diff -Nru mysql-3.23.49/extra/Makefile.am mysql-3.23.49.new/extra/Makefile.am
 130 --- mysql-3.23.49/extra/Makefile.am     Tue Sep 11 14:28:24 2001
 131 +++ mysql-3.23.49.new/extra/Makefile.am Tue Sep 11 14:19:11 2001
 132 @@ -14,9 +14,11 @@
 133  # along with this program; if not, write to the Free Software
 134  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 135
 136 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I..
 137 -LDADD =                        @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 138 -                       ../dbug/libdbug.a ../strings/libmystrings.a
 139 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include -I..
 140 +LDADD =                        $(CLIENT_EXTRA_LDFLAGS) \
 141 +                       $(top_builddir)/mysys/libmysys.a \
 142 +                       $(top_builddir)/dbug/libdbug.a \
 143 +                       $(top_builddir)/strings/libmystrings.a
 144  bin_PROGRAMS =         replace comp_err perror resolveip my_print_defaults \
 145  resolve_stack_dump
 146
 147 diff -Nru mysql-3.23.49/heap/Makefile.am mysql-3.23.49.new/heap/Makefile.am
 148 --- mysql-3.23.49/heap/Makefile.am      Tue Sep 11 14:28:24 2001
 149 +++ mysql-3.23.49.new/heap/Makefile.am  Tue Sep 11 14:19:11 2001
 150 @@ -14,13 +14,14 @@
 151  # along with this program; if not, write to the Free Software
 152  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 153
 154 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 155 -LDADD =                        libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
 156 -                       ../strings/libmystrings.a
 157 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 158 +LDADD =                        libheap.a $(top_builddir)/mysys/libmysys.a \
 159 +                       $(top_builddir)/dbug/libdbug.a \
 160 +                       $(top_builddir)/strings/libmystrings.a
 161  pkglib_LIBRARIES =     libheap.a
 162  noinst_PROGRAMS        =       hp_test1 hp_test2
 163 -hp_test1_LDFLAGS = @NOINST_LDFLAGS@
 164 -hp_test2_LDFLAGS = @NOINST_LDFLAGS@
 165 +hp_test1_LDFLAGS = $(NOINST_LDFLAGS)
 166 +hp_test2_LDFLAGS = $(NOINST_LDFLAGS)
 167  noinst_HEADERS =       heapdef.h
 168  libheap_a_SOURCES =    hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
 169                         hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
 170 diff -Nru mysql-3.23.49/isam/Makefile.am mysql-3.23.49.new/isam/Makefile.am
 171 --- mysql-3.23.49/isam/Makefile.am      Tue Sep 11 14:28:24 2001
 172 +++ mysql-3.23.49.new/isam/Makefile.am  Tue Sep 11 14:19:11 2001
 173 @@ -14,9 +14,11 @@
 174  # along with this program; if not, write to the Free Software
 175  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 176
 177 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 178 -LDADD =                        @CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
 179 -                       ../dbug/libdbug.a ../strings/libmystrings.a
 180 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 181 +LDADD =                        $(CLIENT_EXTRA_LDFLAGS) libnisam.a \
 182 +                       $(top_builddir)/mysys/libmysys.a \
 183 +                       $(top_builddir)/dbug/libdbug.a \
 184 +                       $(top_builddir)/strings/libmystrings.a
 185  pkglib_LIBRARIES =     libnisam.a
 186  bin_PROGRAMS =         isamchk isamlog pack_isam
 187  isamchk_DEPENDENCIES=  $(LIBRARIES)
 188 diff -Nru mysql-3.23.49/libmysql/Makefile.am mysql-3.23.49.new/libmysql/Makefile.am
 189 --- mysql-3.23.49/libmysql/Makefile.am  Tue Sep 11 14:28:24 2001
 190 +++ mysql-3.23.49.new/libmysql/Makefile.am      Tue Sep 11 14:19:11 2001
 191 @@ -19,7 +19,7 @@
 192
 193  target = libmysqlclient.la
 194  target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
 195 -LIBS   = @CLIENT_LIBS@
 196 +LIBS   = $(CLIENT_LIBS)
 197  INCLUDES =     -I$(srcdir)/../include -I../include \
 198                 -I$(srcdir)/.. -I$(top_srcdir) -I..
 199
 200 @@ -38,19 +38,19 @@
 201           ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
 202           for f in $$ss; do \
 203             rm -f $(srcdir)/$$f; \
 204 -           @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
 205 +           $(LN_CP_F) $(srcdir)/../strings/$$f $(srcdir)/$$f; \
 206           done; \
 207           for f in $(mystringsextra); do \
 208             rm -f $(srcdir)/$$f; \
 209 -           @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
 210 +           $(LN_CP_F) $(srcdir)/../strings/$$f $(srcdir)/$$f; \
 211           done; \
 212           for f in $$ds; do \
 213             rm -f $(srcdir)/$$f; \
 214 -           @LN_CP_F@ $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
 215 +           $(LN_CP_F) $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
 216           done; \
 217           for f in $$ms $(mysysheaders); do \
 218             rm -f $(srcdir)/$$f; \
 219 -           @LN_CP_F@ $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
 220 +           $(LN_CP_F) $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
 221           done;
 222
 223  # This part requires GNUmake
 224 diff -Nru mysql-3.23.49/libmysql_r/Makefile.am mysql-3.23.49.new/libmysql_r/Makefile.am
 225 --- mysql-3.23.49/libmysql_r/Makefile.am        Tue Sep 11 14:28:24 2001
 226 +++ mysql-3.23.49.new/libmysql_r/Makefile.am    Tue Sep 11 14:19:11 2001
 227 @@ -19,9 +19,8 @@
 228
 229  target = libmysqlclient_r.la
 230  target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
 231 -## LIBS = @LIBS@
 232
 233 -INCLUDES =     @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
 234 +INCLUDES =     $(MT_INCLUDES) -I$(srcdir)/../include -I../include \
 235                 -I$(srcdir)/.. -I$(top_srcdir) -I..
 236
 237  ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 238 @@ -38,5 +37,5 @@
 239         set -x; \
 240         for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
 241           rm -f $(srcdir)/$$f; \
 242 -         @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \
 243 +         $(LN_CP_F) $(libmysql_dir)/$$f $(srcdir)/$$f; \
 244         done
 245 diff -Nru mysql-3.23.49/merge/Makefile.am mysql-3.23.49.new/merge/Makefile.am
 246 --- mysql-3.23.49/merge/Makefile.am     Tue Sep 11 14:28:24 2001
 247 +++ mysql-3.23.49.new/merge/Makefile.am Tue Sep 11 14:19:11 2001
 248 @@ -14,7 +14,7 @@
 249  # along with this program; if not, write to the Free Software
 250  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 251
 252 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 253 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 254  pkglib_LIBRARIES =     libmerge.a
 255  noinst_HEADERS =       mrgdef.h
 256  libmerge_a_SOURCES =   open.c extra.c info.c _locking.c \
 257 diff -Nru mysql-3.23.49/myisam/Makefile.am mysql-3.23.49.new/myisam/Makefile.am
 258 --- mysql-3.23.49/myisam/Makefile.am    Tue Sep 11 14:28:24 2001
 259 +++ mysql-3.23.49.new/myisam/Makefile.am        Tue Sep 11 14:19:11 2001
 260 @@ -17,9 +17,11 @@
 261  EXTRA_DIST =           mi_test_all.sh mi_test_all.res
 262  pkgdata_DATA =         mi_test_all mi_test_all.res
 263
 264 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 265 -LDADD =                        @CLIENT_EXTRA_LDFLAGS@ libmyisam.a ../mysys/libmysys.a \
 266 -                       ../dbug/libdbug.a ../strings/libmystrings.a
 267 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 268 +LDADD =                        $(CLIENT_EXTRA_LDFLAGS) libmyisam.a \
 269 +                       $(top_builddir)/mysys/libmysys.a \
 270 +                       $(top_builddir)/dbug/libdbug.a \
 271 +                       $(top_builddir)/strings/libmystrings.a
 272  pkglib_LIBRARIES =     libmyisam.a
 273  bin_PROGRAMS =         myisamchk myisamlog myisampack
 274  myisamchk_DEPENDENCIES=        $(LIBRARIES)
 275 @@ -56,46 +58,46 @@
 276  SUFFIXES = .sh
 277
 278  .sh:
 279 -       @RM@ -f $@ $@-t
 280 -       @SED@ \
 281 +       $(RM) -f $@ $@-t
 282 +       $(SED) \
 283           -e 's!@''bindir''@!$(bindir)!g' \
 284           -e 's!@''scriptdir''@!$(bindir)!g' \
 285           -e 's!@''prefix''@!$(prefix)!g' \
 286           -e 's!@''datadir''@!$(datadir)!g' \
 287           -e 's!@''localstatedir''@!$(localstatedir)!g' \
 288           -e 's!@''libexecdir''@!$(libexecdir)!g' \
 289 -         -e 's!@''CC''@!@CC@!'\
 290 -         -e 's!@''CXX''@!@CXX@!'\
 291 -         -e 's!@''GXX''@!@GXX@!'\
 292 -         -e 's!@''PERL''@!@PERL@!' \
 293 -         -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
 294 -         -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
 295 -         -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
 296 -         -e 's!@''VERSION''@!@VERSION@!' \
 297 -         -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 298 -         -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
 299 -         -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
 300 -         -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
 301 -         -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
 302 -         -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
 303 -         -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
 304 -         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
 305 -         -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
 306 -         -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
 307 -         -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
 308 -         -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 309 -         -e 's!@''sysconfdir''@!@sysconfdir@!' \
 310 -         -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
 311 -         -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
 312 -         -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
 313 -         -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
 314 -         -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 315 -         -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
 316 -         -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
 317 -         -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
 318 +         -e 's!@''CC''@!$(CC)!'\
 319 +         -e 's!@''CXX''@!$(CXX)!'\
 320 +         -e 's!@''GXX''@!$(GXX)!'\
 321 +         -e 's!@''PERL''@!$(PERL)!' \
 322 +         -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
 323 +         -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
 324 +         -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
 325 +         -e 's!@''VERSION''@!$(VERSION)!' \
 326 +         -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
 327 +         -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
 328 +         -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
 329 +         -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
 330 +         -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
 331 +         -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
 332 +         -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
 333 +         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
 334 +         -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
 335 +         -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
 336 +         -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
 337 +         -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
 338 +         -e 's!@''sysconfdir''@!$(sysconfdir)!' \
 339 +         -e 's!@''SHORT_MYSQL_INTRO''@!$(SHORT_MYSQL_INTRO)!' \
 340 +         -e 's!@''SHARED_LIB_VERSION''@!$(SHARED_LIB_VERSION)!' \
 341 +         -e 's!@''MYSQL_BASE_VERSION''@!$(MYSQL_BASE_VERSION)!' \
 342 +         -e 's!@''MYSQL_NO_DASH_VERSION''@!$(MYSQL_NO_DASH_VERSION)!' \
 343 +         -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
 344 +         -e 's!@''PERL_DBI_VERSION''@!$(PERL_DBI_VERSION)!' \
 345 +         -e 's!@''PERL_DBD_VERSION''@!$(PERL_DBD_VERSION)!' \
 346 +         -e 's!@''PERL_DATA_DUMPER''@!$(PERL_DATA_DUMPER)!' \
 347         $< > $@-t
 348 -       @CHMOD@ +x $@-t
 349 -       @MV@ $@-t $@
 350 +       $(CHMOD) +x $@-t
 351 +       $(MV) $@-t $@
 352
 353  # Don't update the files from bitkeeper
 354  %::SCCS/s.%
 355 diff -Nru mysql-3.23.49/myisammrg/Makefile.am mysql-3.23.49.new/myisammrg/Makefile.am
 356 --- mysql-3.23.49/myisammrg/Makefile.am Tue Sep 11 14:28:24 2001
 357 +++ mysql-3.23.49.new/myisammrg/Makefile.am     Tue Sep 11 14:19:11 2001
 358 @@ -14,7 +14,7 @@
 359  # along with this program; if not, write to the Free Software
 360  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 361
 362 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 363 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 364  pkglib_LIBRARIES =     libmyisammrg.a
 365  noinst_HEADERS =       mymrgdef.h
 366  libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
 367 diff -Nru mysql-3.23.49/mysql-test/Makefile.am mysql-3.23.49.new/mysql-test/Makefile.am
 368 --- mysql-3.23.49/mysql-test/Makefile.am        Tue Sep 11 14:28:24 2001
 369 +++ mysql-3.23.49.new/mysql-test/Makefile.am    Tue Sep 11 14:19:11 2001
 370 @@ -48,8 +48,8 @@
 371  SUFFIXES = .sh
 372
 373  .sh:
 374 -       @RM@ -f $@ $@-t
 375 -       @SED@ \
 376 +       $(RM) -f $@ $@-t
 377 +       $(SED) \
 378           -e 's!@''testdir''@!$(testdir)!g' \
 379           -e 's!@''bindir''@!$(bindir)!g' \
 380           -e 's!@''scriptdir''@!$(bindir)!g' \
 381 @@ -57,12 +57,12 @@
 382           -e 's!@''datadir''@!$(datadir)!g' \
 383           -e 's!@''localstatedir''@!$(localstatedir)!g' \
 384           -e 's!@''libexecdir''@!$(libexecdir)!g' \
 385 -         -e 's!@''PERL''@!@PERL@!' \
 386 -         -e 's!@''VERSION''@!@VERSION@!' \
 387 -         -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 388 +         -e 's!@''PERL''@!$(PERL)!' \
 389 +         -e 's!@''VERSION''@!$(VERSION)!' \
 390 +         -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
 391           $< > $@-t
 392 -       @CHMOD@ +x $@-t
 393 -       @MV@ $@-t $@
 394 +       $(CHMOD) +x $@-t
 395 +       $(MV) $@-t $@
 396
 397  # Don't update the files from bitkeeper
 398  %::SCCS/s.%
 399 diff -Nru mysql-3.23.49/mysys/Makefile.am mysql-3.23.49.new/mysys/Makefile.am
 400 --- mysql-3.23.49/mysys/Makefile.am     Tue Sep 11 14:28:24 2001
 401 +++ mysql-3.23.49.new/mysys/Makefile.am Tue Sep 11 14:29:50 2001
 402 @@ -14,13 +14,10 @@
 403  # along with this program; if not, write to the Free Software
 404  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 405
 406 -MYSQLDATAdir =         $(localstatedir)
 407 -MYSQLSHAREdir =                $(pkgdatadir)
 408 -MYSQLBASEdir=          $(prefix)
 409 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include -I.. -I$(srcdir)
 410 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include -I.. -I$(srcdir)
 411  pkglib_LIBRARIES =     libmysys.a
 412 -LDADD =                        libmysys.a ../dbug/libdbug.a \
 413 -                       ../strings/libmystrings.a
 414 +LDADD =                        libmysys.a $(top_builddir)/dbug/libdbug.a \
 415 +                       $(top_builddir)/strings/libmystrings.a
 416  noinst_HEADERS =       mysys_priv.h my_static.h
 417  libmysys_a_SOURCES =   my_init.c my_getwd.c mf_getdate.c\
 418                         mf_path.c mf_loadpath.c\
 419 @@ -49,53 +46,50 @@
 420                         my_vsnprintf.c charset.c my_bitmap.c
 421  EXTRA_DIST =           thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 422                         thr_mutex.c thr_rwlock.c
 423 -libmysys_a_LIBADD =    @THREAD_LOBJECTS@
 424 +libmysys_a_LIBADD =    $(THREAD_LOBJECTS)
 425  # test_fn removed 980815 since it not upp to date test_dir
 426 -noinst_PROGRAMS =      test_charset @THREAD_LPROGRAMS@
 427 +noinst_PROGRAMS =      test_charset $(THREAD_LPROGRAMS)
 428  # test_dir_DEPENDENCIES=       $(LIBRARIES)
 429  # testhash_DEPENDENCIES=       $(LIBRARIES)
 430  test_charset_DEPENDENCIES=     $(LIBRARIES)
 431  EXTRA_PROGRAMS =
 432  DEFS =                 -DDEFAULT_BASEDIR=\"$(prefix)\" \
 433 -                       -DDATADIR="\"$(MYSQLDATAdir)\"" \
 434 -                       -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 435 -                       -DDATADIR="\"$(MYSQLDATAdir)\"" \
 436 -                       -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 437 +                       -DDEFAULT_CHARSET_HOME="\"$(prefix)\"" \
 438 +                       -DSHAREDIR="\"$(pkgdatadir)\"" \
 439                          @DEFS@
 440
 441  libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
 442
 443 -
 444  # I hope this always does the right thing. Otherwise this is only test programs
 445 -FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
 446 +FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(NOINST_LDFLAGS)
 447
 448  #
 449  # The CP .. RM stuff is to avoid problems with some compilers (like alpha ccc)
 450  # which automaticly removes the object files you use to compile a final program
 451  #
 452
 453 -test_thr_alarm: thr_alarm.c $(LIBRARIES)
 454 +test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
 455         $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
 456         $(LINK) $(FLAGS) -DMAIN  ./test_thr_alarm.c $(LDADD) $(LIBS)
 457         $(RM) -f ./test_thr_alarm.*
 458
 459 -test_thr_lock: thr_lock.c $(LIBRARIES)
 460 +test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
 461         $(CP) $(srcdir)/thr_lock.c test_thr_lock.c
 462         $(LINK) $(FLAGS) -DMAIN  ./test_thr_lock.c $(LDADD) $(LIBS)
 463         $(RM) -f ./test_thr_lock.*
 464
 465 -test_vsnprintf: my_vsnprintf.c $(LIBRARIES)
 466 +test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
 467         $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
 468         $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
 469         $(RM) -f test_vsnprintf.*
 470
 471 -test_dir: test_dir.c $(LIBRARIES)
 472 +test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
 473         $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
 474
 475 -test_charset: test_charset.c $(LIBRARIES)
 476 +test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
 477         $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
 478
 479 -testhash: testhash.c $(LIBRARIES)
 480 +testhash$(EXEEXT): testhash.c $(LIBRARIES)
 481         $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
 482
 483  # Don't update the files from bitkeeper
 484 diff -Nru mysql-3.23.49/regex/Makefile.am mysql-3.23.49.new/regex/Makefile.am
 485 --- mysql-3.23.49/regex/Makefile.am     Tue Sep 11 14:28:24 2001
 486 +++ mysql-3.23.49.new/regex/Makefile.am Tue Sep 11 14:19:11 2001
 487 @@ -15,7 +15,7 @@
 488  # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 489  # MA 02111-1307, USA
 490
 491 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 492 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 493  noinst_LIBRARIES =     libregex.a
 494  LDADD =                        libregex.a ../strings/libmystrings.a
 495  noinst_HEADERS =       cclass.h cname.h regex2.h utils.h engine.c regex.h
 496 diff -Nru mysql-3.23.49/scripts/Makefile.am mysql-3.23.49.new/scripts/Makefile.am
 497 --- mysql-3.23.49/scripts/Makefile.am   Tue Sep 11 14:28:24 2001
 498 +++ mysql-3.23.49.new/scripts/Makefile.am       Tue Sep 11 14:19:11 2001
 499 @@ -76,8 +76,8 @@
 500  SUFFIXES = .sh
 501
 502  .sh:
 503 -       @RM@ -f $@ $@-t
 504 -       @SED@ \
 505 +       $(RM) -f $@ $@-t
 506 +       $(SED) \
 507           -e 's!@''bindir''@!$(bindir)!g' \
 508           -e 's!@''sbindir''@!$(sbindir)!g' \
 509           -e 's!@''scriptdir''@!$(bindir)!g' \
 510 @@ -87,31 +87,31 @@
 511           -e 's!@''libexecdir''@!$(libexecdir)!g' \
 512           -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 513           -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 514 -         -e 's!@''CC''@!@CC@!'\
 515 -         -e 's!@''CXX''@!@CXX@!'\
 516 -         -e 's!@''GXX''@!@GXX@!'\
 517 -         -e 's!@''PERL''@!@PERL@!' \
 518 -         -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
 519 -         -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
 520 -         -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
 521 -         -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
 522 -         -e 's!@''VERSION''@!@VERSION@!' \
 523 -         -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 524 -         -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
 525 -         -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
 526 -         -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
 527 -         -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
 528 -         -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
 529 -         -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
 530 -         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
 531 -         -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
 532 -         -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 533 -         -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
 534 -         -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
 535 -         -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 536 +         -e 's!@''CC''@!$(CC)!'\
 537 +         -e 's!@''CXX''@!$(CXX)!'\
 538 +         -e 's!@''GXX''@!$(GXX)!'\
 539 +         -e 's!@''PERL''@!$(PERL)!' \
 540 +         -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
 541 +         -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
 542 +         -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
 543 +         -e 's!@''CLIENT_LIBS''@!$(CLIENT_LIBS)!' \
 544 +         -e 's!@''VERSION''@!$(VERSION)!' \
 545 +         -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
 546 +         -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
 547 +         -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
 548 +         -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
 549 +         -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
 550 +         -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
 551 +         -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
 552 +         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
 553 +         -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
 554 +         -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
 555 +         -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
 556 +         -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
 557 +         -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
 558         $< > $@-t
 559 -       @CHMOD@ +x $@-t
 560 -       @MV@ $@-t $@
 561 +       $(CHMOD) +x $@-t
 562 +       $(MV) $@-t $@
 563
 564  # Don't update the files from bitkeeper
 565  %::SCCS/s.%
 566 diff -Nru mysql-3.23.49/sql/Makefile.am mysql-3.23.49.new/sql/Makefile.am
 567 --- mysql-3.23.49/sql/Makefile.am       Tue Sep 11 14:28:24 2001
 568 +++ mysql-3.23.49.new/sql/Makefile.am   Tue Sep 11 14:19:11 2001
 569 @@ -20,16 +20,15 @@
 570  MYSQLDATAdir =         $(localstatedir)
 571  MYSQLSHAREdir =                $(pkgdatadir)
 572  MYSQLBASEdir=          $(prefix)
 573 -INCLUDES =             @MT_INCLUDES@ \
 574 -                       @bdb_includes@ @innodb_includes@ @gemini_includes@ \
 575 +INCLUDES =             $(MT_INCLUDES) \
 576 +                       $(bdb_includes) $(innodb_includes) $(gemini_includes) \
 577                         -I$(srcdir)/../include \
 578                         -I$(srcdir)/../regex \
 579                         -I$(srcdir) -I../include -I.. -I.
 580 -WRAPLIBS=              @WRAPLIBS@
 581  SUBDIRS =              share
 582  libexec_PROGRAMS =     mysqld
 583  noinst_PROGRAMS =      gen_lex_hash
 584 -gen_lex_hash_LDFLAGS =        @NOINST_LDFLAGS@
 585 +gen_lex_hash_LDFLAGS =        $(NOINST_LDFLAGS)
 586  LDADD =                        ../isam/libnisam.a \
 587                         ../merge/libmerge.a \
 588                         ../myisam/libmyisam.a \
 589 @@ -39,9 +38,9 @@
 590                         ../dbug/libdbug.a \
 591                         ../regex/libregex.a \
 592                         ../strings/libmystrings.a
 593 -mysqld_LDADD =         @MYSQLD_EXTRA_LDFLAGS@ \
 594 -                       @bdb_libs@ @innodb_libs@ @gemini_libs@ \
 595 -                       $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@
 596 +mysqld_LDADD =         $(MYSQLD_EXTRA_LDFLAGS) \
 597 +                       $(bdb_libs) $(innodb_libs) $(gemini_libs) \
 598 +                       $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) $(LIBDL)
 599  noinst_HEADERS =       item.h item_func.h item_sum.h item_cmpfunc.h \
 600                         item_strfunc.h item_timefunc.h item_uniq.h \
 601                         item_create.h mysql_priv.h \
 602 @@ -95,7 +94,7 @@
 603
 604  link_sources:
 605         rm -f mini_client_errors.c
 606 -       @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
 607 +       $(LN_CP_F) ../libmysql/errmsg.c mini_client_errors.c
 608
 609  gen_lex_hash.o:                gen_lex_hash.cc lex.h
 610                         $(CXXCOMPILE) -c $(INCLUDES) $<
 611 --- mysql-3.23.51/sql/share/Makefile.am.orig    Mon Jun  3 12:39:02 2002
 612 +++ mysql-3.23.51/sql/share/Makefile.am Thu Jun 13 00:39:27 2002
 613 @@ -1,7 +1,7 @@
 614  ## Process this file with automake to create Makefile.in
 615
 616  dist-hook:
 617 -       for dir in charsets @AVAILABLE_LANGUAGES@; do \
 618 +       for dir in charsets $(AVAILABLE_LANGUAGES); do \
 619           test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \
 620           $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \
 621         done; \
 622 @@ -9,13 +9,13 @@
 623         $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
 624         $(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets
 625
 626 -all: @AVAILABLE_LANGUAGES_ERRORS@
 627 +all: $(AVAILABLE_LANGUAGES_ERRORS)
 628
 629  # this is ugly, but portable
 630 -@AVAILABLE_LANGUAGES_ERRORS_RULES@
 631 +$(AVAILABLE_LANGUAGES_ERRORS_RULES)
 632
 633  install-data-local:
 634 -       for lang in @AVAILABLE_LANGUAGES@; \
 635 +       for lang in $(AVAILABLE_LANGUAGES); \
 636         do \
 637                 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \
 638                 $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \
 639 --- mysql-3.23.49/sql-bench/Makefile.am Tue Sep 11 14:28:24 2001
 640 +++ mysql-3.23.49.new/sql-bench/Makefile.am     Tue Sep 11 14:19:11 2001
 641 @@ -65,8 +65,8 @@
 642  SUFFIXES = .sh
 643
 644  .sh:
 645 -       @RM@ -f $@ $@-t
 646 -       @SED@ \
 647 +       $(RM) -f $@ $@-t
 648 +       $(SED) \
 649           -e 's!@''benchdir''@!$(benchdir)!g' \
 650           -e 's!@''bindir''@!$(bindir)!g' \
 651           -e 's!@''scriptdir''@!$(bindir)!g' \
 652 @@ -74,12 +74,12 @@
 653           -e 's!@''datadir''@!$(datadir)!g' \
 654           -e 's!@''localstatedir''@!$(localstatedir)!g' \
 655           -e 's!@''libexecdir''@!$(libexecdir)!g' \
 656 -         -e 's!@''PERL''@!@PERL@!' \
 657 -         -e 's!@''VERSION''@!@VERSION@!' \
 658 -         -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 659 +         -e 's!@''PERL''@!$(PERL)!' \
 660 +         -e 's!@''VERSION''@!$(VERSION)!' \
 661 +         -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
 662           $< > $@-t
 663 -       @CHMOD@ +x $@-t
 664 -       @MV@ $@-t $@
 665 +       $(CHMOD) +x $@-t
 666 +       $(MV) $@-t $@
 667
 668  # Don't update the files from bitkeeper
 669  %::SCCS/s.%
 670 diff -Nru mysql-3.23.49/strings/Makefile.am mysql-3.23.49.new/strings/Makefile.am
 671 --- mysql-3.23.49/strings/Makefile.am   Tue Sep 11 14:28:24 2001
 672 +++ mysql-3.23.49.new/strings/Makefile.am       Tue Sep 11 14:19:11 2001
 673 @@ -16,7 +16,7 @@
 674
 675  # This file is public domain and comes with NO WARRANTY of any kind
 676
 677 -INCLUDES =             @MT_INCLUDES@ -I$(srcdir)/../include -I../include
 678 +INCLUDES =             $(MT_INCLUDES) -I$(srcdir)/../include -I../include
 679  pkglib_LIBRARIES =     libmystrings.a
 680
 681  # Exact one of ASSEMBLER_X
 682 @@ -53,20 +53,20 @@
 683                         strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
 684                         strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
 685
 686 -libmystrings_a_LIBADD= @CHARSET_OBJS@
 687 +libmystrings_a_LIBADD= $(CHARSET_OBJS)
 688  ctype.o:               ctype_extra_sources.c
 689
 690  ctype_extra_sources.c: conf_to_src
 691 -       ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \
 692 +       ./conf_to_src $(top_srcdir) $(CHARSETS_NEED_SOURCE) > \
 693                       $(srcdir)/ctype_extra_sources.c
 694  conf_to_src_SOURCES = conf_to_src.c
 695  conf_to_src_LDADD=
 696  #force static linking of conf_to_src - essential when linking against
 697  #custom installation of libc
 698 -conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
 699 +conf_to_src_LDFLAGS= $(NOINST_LDFLAGS)
 700
 701 -# This is because the dependency tracking misses @FOO@ vars in sources.
 702 -strtoull.o:            @CHARSET_OBJS@
 703 +# This is because the dependency tracking misses $(FOO) vars in sources.
 704 +strtoull.o:            $(CHARSET_OBJS)
 705
 706  clean-local:
 707         rm -f ctype_extra_sources.c
 708 diff -Nru mysql-3.23.49/support-files/Makefile.am mysql-3.23.49.new/support-files/Makefile.am
 709 --- mysql-3.23.49/support-files/Makefile.am     Tue Sep 11 14:28:24 2001
 710 +++ mysql-3.23.49.new/support-files/Makefile.am Tue Sep 11 14:19:11 2001
 711 @@ -32,7 +32,7 @@
 712                         my-large.cnf \
 713                         my-huge.cnf \
 714                         mysql-log-rotate \
 715 -                       mysql-@VERSION@.spec \
 716 +                       mysql-$(VERSION).spec \
 717                         binary-configure
 718
 719  pkgdata_SCRIPTS =      mysql.server
 720 @@ -42,21 +42,21 @@
 721                         my-large.cnf \
 722                         my-huge.cnf \
 723                         mysql.spec \
 724 -                       mysql-@VERSION@.spec \
 725 +                       mysql-$(VERSION).spec \
 726                         mysql-log-rotate \
 727                         mysql.server \
 728                         binary-configure
 729
 730
 731 -mysql-@VERSION@.spec:  mysql.spec
 732 +mysql-$(VERSION).spec: mysql.spec
 733                         rm -f $@
 734                         cp mysql.spec $@
 735
 736  SUFFIXES = .sh
 737
 738  .sh:
 739 -       @RM@ -f $@ $@-t
 740 -       @SED@ \
 741 +       $(RM) -f $@ $@-t
 742 +       $(SED) \
 743           -e 's!@''bindir''@!$(bindir)!g' \
 744           -e 's!@''sbindir''@!$(sbindir)!g' \
 745           -e 's!@''scriptdir''@!$(bindir)!g' \
 746 @@ -64,37 +64,37 @@
 747           -e 's!@''datadir''@!$(datadir)!g' \
 748           -e 's!@''localstatedir''@!$(localstatedir)!g' \
 749           -e 's!@''libexecdir''@!$(libexecdir)!g' \
 750 -         -e 's!@''CC''@!@CC@!'\
 751 -         -e 's!@''CXX''@!@CXX@!'\
 752 -         -e 's!@''GXX''@!@GXX@!'\
 753 -         -e 's!@''PERL''@!@PERL@!' \
 754 -         -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
 755 -         -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
 756 -         -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
 757 -         -e 's!@''VERSION''@!@VERSION@!' \
 758 -         -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 759 -         -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
 760 -         -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
 761 -         -e 's!@''HOSTNAME''@!@HOSTNAME@!' \
 762 -         -e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
 763 -         -e 's!@''CHECK_PID''@!@CHECK_PID@!' \
 764 -         -e 's!@''FIND_PROC''@!@FIND_PROC@!' \
 765 -         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
 766 -         -e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
 767 -         -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
 768 -         -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
 769 -         -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 770 -         -e 's!@''sysconfdir''@!@sysconfdir@!' \
 771 -         -e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
 772 -         -e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
 773 -         -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
 774 -         -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
 775 -         -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 776 -         -e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
 777 -         -e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
 778 -         -e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
 779 +         -e 's!@''CC''@!$(CC)!'\
 780 +         -e 's!@''CXX''@!$(CXX)!'\
 781 +         -e 's!@''GXX''@!$(GXX)!'\
 782 +         -e 's!@''PERL''@!$(PERL)!' \
 783 +         -e 's!@''CFLAGS''@!$(SAVE_CFLAGS)!'\
 784 +         -e 's!@''CXXFLAGS''@!$(SAVE_CXXFLAGS)!'\
 785 +         -e 's!@''LDFLAGS''@!$(SAVE_LDFLAGS)!'\
 786 +         -e 's!@''VERSION''@!$(VERSION)!' \
 787 +         -e 's!@''MYSQL_SERVER_SUFFIX''@!$(MYSQL_SERVER_SUFFIX)!' \
 788 +         -e 's!@''COMPILATION_COMMENT''@!$(COMPILATION_COMMENT)!' \
 789 +         -e 's!@''MACHINE_TYPE''@!$(MACHINE_TYPE)!' \
 790 +         -e 's!@''HOSTNAME''@!$(HOSTNAME)!' \
 791 +         -e 's!@''SYSTEM_TYPE''@!$(SYSTEM_TYPE)!' \
 792 +         -e 's!@''CHECK_PID''@!$(CHECK_PID)!' \
 793 +         -e 's!@''FIND_PROC''@!$(FIND_PROC)!' \
 794 +         -e 's!@''MYSQLD_DEFAULT_SWITCHES''@!$(MYSQLD_DEFAULT_SWITCHES)!' \
 795 +         -e 's!@''MYSQL_UNIX_ADDR''@!$(MYSQL_UNIX_ADDR)!' \
 796 +         -e 's!@''IS_LINUX''@!$(IS_LINUX)!' \
 797 +         -e "s!@""CONF_COMMAND""@!$(CONF_COMMAND)!" \
 798 +         -e 's!@''MYSQLD_USER''@!$(MYSQLD_USER)!' \
 799 +         -e 's!@''sysconfdir''@!$(sysconfdir)!' \
 800 +         -e 's!@''SHORT_MYSQL_INTRO''@!$(SHORT_MYSQL_INTRO)!' \
 801 +         -e 's!@''SHARED_LIB_VERSION''@!$(SHARED_LIB_VERSION)!' \
 802 +         -e 's!@''MYSQL_BASE_VERSION''@!$(MYSQL_BASE_VERSION)!' \
 803 +         -e 's!@''MYSQL_NO_DASH_VERSION''@!$(MYSQL_NO_DASH_VERSION)!' \
 804 +         -e 's!@''MYSQL_TCP_PORT''@!$(MYSQL_TCP_PORT)!' \
 805 +         -e 's!@''PERL_DBI_VERSION''@!$(PERL_DBI_VERSION)!' \
 806 +         -e 's!@''PERL_DBD_VERSION''@!$(PERL_DBD_VERSION)!' \
 807 +         -e 's!@''PERL_DATA_DUMPER''@!$(PERL_DATA_DUMPER)!' \
 808         $< > $@-t
 809 -       @MV@ $@-t $@
 810 +       $(MV) $@-t $@
 811
 812  # Don't update the files from bitkeeper
 813  %::SCCS/s.%