diff options
| author | unknown <joerg@mysql.com> | 2004-08-24 19:05:42 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-08-24 19:05:42 +0200 |
| commit | 47d87c639c9b8150bda20da8e22992121285fe1c (patch) | |
| tree | d2ce9d82d5574db50a49915625d4c749d91eccc9 | |
| parent | 9d1a9d72cba1aa828e631f520540411d7508a4e0 (diff) | |
| download | mariadb-git-47d87c639c9b8150bda20da8e22992121285fe1c.tar.gz | |
All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options.
libmysqld/Makefile.am:
Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index d16de3077f3..441e8a1f1c1 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -57,6 +57,7 @@ jcole@main.burghcom.com jcole@mugatu.spaceapes.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com +joerg@mysql.com jorge@linux.jorge.mysql.com kaj@work.mysql.com konstantin@mysql.com diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 54c7ada4a85..ef0f61b4234 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -89,9 +89,9 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) cd tmp ; \ for file in *.a ; do \ bfile=`basename $$file .a` ; \ - ar x $$file; \ + $(AR) x $$file; \ for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \ - ar q ../libmysqld_int2.a *.o ; \ + $(AR) q ../libmysqld_int2.a *.o ; \ rm -f *.o ; \ done ; \ cd .. ; \ |