diff -au configure.orig configure
--- configure.orig	2007-09-03 14:38:50.000000000 -0400
+++ configure	2007-09-03 14:42:18.000000000 -0400
@@ -22072,6 +22072,15 @@
 
 fi
 
+# Check whether --with-conf-dir or --without-conf-dir was given.
+if test "${with_conf_dir+set}" = set; then
+  withval="$with_conf_dir"
+   MYSQL_CONF_DIR=$withval
+else
+   eval "MYSQL_CONF_DIR=\"${sysconfdir}\""
+fi;
+
+
 
 if test "$with_named_curses" = "no"
 then
@@ -32110,6 +32119,7 @@
 NOINST_LDFLAGS!$NOINST_LDFLAGS$ac_delim
 MYSQL_SERVER_SUFFIX!$MYSQL_SERVER_SUFFIX$ac_delim
 MYSQL_UNIX_ADDR!$MYSQL_UNIX_ADDR$ac_delim
+MYSQL_CONF_DIR!$MYSQL_CONF_DIR$ac_delim
 MYSQL_TCP_PORT!$MYSQL_TCP_PORT$ac_delim
 MYSQL_TCP_PORT_DEFAULT!$MYSQL_TCP_PORT_DEFAULT$ac_delim
 MYSQLD_USER!$MYSQLD_USER$ac_delim
diff -au include/mysql_version.h.in.orig include/mysql_version.h.in
--- include/mysql_version.h.in.orig	2007-09-03 14:46:20.000000000 -0400
+++ include/mysql_version.h.in	2007-09-03 14:39:09.000000000 -0400
@@ -16,6 +16,7 @@
 #define MYSQL_VERSION_ID		@MYSQL_VERSION_ID@
 #define MYSQL_PORT			@MYSQL_TCP_PORT@
 #define MYSQL_UNIX_ADDR			"@MYSQL_UNIX_ADDR@"
+#define MYSQL_CONF_DIR			"@MYSQL_CONF_DIR@"
 #define MYSQL_CONFIG_NAME		"my"
 #define MYSQL_COMPILATION_COMMENT	"@COMPILATION_COMMENT@"
 
diff -au mysys/default.c.orig mysys/default.c
--- mysys/default.c.orig	2007-09-03 14:46:20.000000000 -0400
+++ mysys/default.c	2007-09-03 14:39:09.000000000 -0400
@@ -34,6 +34,7 @@
 ****************************************************************************/
 
 #include "mysys_priv.h"
+#include "mysql_version.h"
 #include "m_string.h"
 #include "m_ctype.h"
 #include <my_dir.h>
@@ -1010,10 +1011,10 @@
     *ptr++= (char *)&shared_system_dir;
 
 #elif defined(__NETWARE__)
-  *ptr++= "sys:/etc/";
+  *ptr++= "sys:"MYSQL_CONF_DIR"/";
 #else
-  *ptr++= "/etc/";
-  *ptr++= "/etc/mysql/";
+  *ptr++= MYSQL_CONF_DIR"/";
+  *ptr++= MYSQL_CONF_DIR"/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;