diff options
| author | unknown <kent@mysql.com> | 2005-11-19 11:20:52 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-19 11:20:52 +0100 |
| commit | 6e478b60ebe881c7a9ab660cb110e267d50f2910 (patch) | |
| tree | 72e512a15fa352244220469442c3b8e3c2b1b59f /server-tools | |
| parent | 6ba79a251681a765f491db1428a467a0a06a69bd (diff) | |
| parent | 0bf5fa03c77e1fca3fa97672b1c987a2771945ed (diff) | |
| download | mariadb-git-6e478b60ebe881c7a9ab660cb110e267d50f2910.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
configure.in:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 8 |
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 |