summaryrefslogtreecommitdiff
path: root/libmysqld/Makefile.am
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-03 17:10:36 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-03 17:10:36 +0300
commitf74c9dd04daae26a6c528729d0de90ba62dc9068 (patch)
tree35d57972d218fde29acc34b05b90339ebaa0d3cb /libmysqld/Makefile.am
parentc8555bdb35d998e99b6fb568f03c63479ff9272d (diff)
parent51caeae915d3a5add57a785e69b7ce52cac084ad (diff)
downloadmariadb-git-f74c9dd04daae26a6c528729d0de90ba62dc9068.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'libmysqld/Makefile.am')
-rw-r--r--libmysqld/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 20df55ef418..4392c8baf3b 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -154,8 +154,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 \