diff options
| author | unknown <petr@mysql.com> | 2005-02-15 17:34:26 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-15 17:34:26 +0300 |
| commit | 83cce1caa4db636b34639d5f22f4b8512d6121dd (patch) | |
| tree | 0b9b048a6ba5a3e7f75b1fbd7a9f259bc52af51d /server-tools/instance-manager/Makefile.am | |
| parent | 265bc98407202323ad69664e9004118f82699043 (diff) | |
| parent | deba12cd34ad4378465d5691de1d50fe1233121a (diff) | |
| download | mariadb-git-83cce1caa4db636b34639d5f22f4b8512d6121dd.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
server-tools/instance-manager/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/Makefile.am')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index c9c9009a8ec..aab7db968fd 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -30,10 +30,8 @@ liboptions_a_CPPFLAGS= $(CPPFLAGS) \ -DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \ -DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \ -DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \ - -DDEFAULT_MYSQLD_PATH="$(bindir)/mysqld$(EXEEXT)" \ - -DDEFAULT_USER="root" \ - -DDEFAULT_PASSWORD="" \ - -DDEFAULT_MONITORING_INTERVAL="5" \ + -DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \ + -DDEFAULT_MONITORING_INTERVAL="20" \ -DDEFAULT_PORT="2273" \ -DPROTOCOL_VERSION=@PROTOCOL_VERSION@ @@ -59,7 +57,7 @@ client_settings.h: Makefile rm -f $(srcdir)/client_settings.h @LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h -bin_PROGRAMS= mysqlmanager +libexec_PROGRAMS= mysqlmanager mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ manager.h manager.cc log.h log.cc \ @@ -75,7 +73,8 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ instance_options.h instance_options.cc \ buffer.h buffer.cc parse.cc parse.h \ guardian.cc guardian.h \ - mysql_manager_error.h client_func.c + parse_output.cc parse_output.h \ + mysql_manager_error.h mysqlmanager_LDADD= liboptions.a \ libnet.a \ |