summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-11-19 11:20:52 +0100
committerkent@mysql.com <>2005-11-19 11:20:52 +0100
commitbcdd552d6eb5f594105a8b7677e2173326dc0401 (patch)
tree72e512a15fa352244220469442c3b8e3c2b1b59f /server-tools/instance-manager
parent86f1896fb0095e58e07afb3ee62a2e9394ab3579 (diff)
parentb269caecb12b6b7da093f6924e5a7326cc1b75e9 (diff)
downloadmariadb-git-bcdd552d6eb5f594105a8b7677e2173326dc0401.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
Diffstat (limited to 'server-tools/instance-manager')
-rw-r--r--server-tools/instance-manager/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 4fa2a0da405..7449735f0bf 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -53,12 +53,12 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
CLEANFILES= net_serv.cc client_settings.h
net_serv.cc:
- rm -f $(srcdir)/net_serv.cc
- @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc
+ rm -f net_serv.cc
+ @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net_serv.cc
client_settings.h:
- rm -f $(srcdir)/client_settings.h
- @LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h
+ rm -f client_settings.h
+ @LN_CP_F@ $(top_srcdir)/sql/client_settings.h client_settings.h
libexec_PROGRAMS= mysqlmanager