diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-12 19:21:42 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-12 19:21:42 +0300 |
| commit | 357496c091991d5f22f2b06429757415841fb76b (patch) | |
| tree | 5e3f2c3f7e7cf17409629a8cac1e53ee26fff019 /libmysqld | |
| parent | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (diff) | |
| parent | ba3b5a7eb660c7172da1cb4bf64abb9e9a2e0603 (diff) | |
| download | mariadb-git-357496c091991d5f22f2b06429757415841fb76b.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index c3e3086b446..2dde00ad38a 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -155,8 +155,8 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobj if DARWIN_MWCC mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects) else - -rm -f libmysqld.a - if test "$(host_os)" = "netware" ; \ + -rm -f libmysqld.a + if test "$(host_os)" = "netware" ; \ then \ $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \ else \ |