--- server-tools/instance-manager/Makefile.am	2006-03-11 19:03:45.000000000 +0100
+++ server-tools/instance-manager/Makefile.am.oden	2006-03-11 19:03:10.000000000 +0100
@@ -28,12 +28,12 @@
 noinst_LIBRARIES=   libnet.a
 
 liboptions_la_CXXFLAGS= $(CXXFLAGS) \
-	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
-	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
-	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
-	-DDEFAULT_PASSWORD_FILE_NAME="/etc/mysqlmanager.passwd" \
+	-DDEFAULT_PID_FILE_NAME="/var/run/mysqld/mysqlmanager.pid" \
+	-DDEFAULT_LOG_FILE_NAME="/var/log/mysqld/mysqlmanager.log" \
+	-DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \
+	-DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \
 	-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \
-	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \
+	-DDEFAULT_CONFIG_FILE="$(sysconfdir)/my.cnf" \
 	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
 
 liboptions_la_SOURCES= options.h options.cc priv.h priv.cc