|
|
@@ -95,3 +95,72 @@ Index: scripts/mysqld_safe.sh
|
|
|
# Or just give up and use our compiled-in default
|
|
|
else
|
|
|
DATADIR=@localstatedir@
|
|
|
+Index: mysys/Makefile.in
|
|
|
+--- mysys/Makefile.in.orig 2005-10-10 00:47:23 +0200
|
|
|
++++ mysys/Makefile.in 2005-11-10 11:50:57 +0100
|
|
|
+@@ -247,6 +247,7 @@
|
|
|
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
|
|
|
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
|
|
|
+ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
|
|
|
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
|
|
|
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
|
+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
|
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
|
|
|
+@@ -452,6 +453,7 @@
|
|
|
+ vio_dir = @vio_dir@
|
|
|
+ vio_libs = @vio_libs@
|
|
|
+ zlib_dir = @zlib_dir@
|
|
|
++MYSQLETCdir = $(sysconfdir)
|
|
|
+ MYSQLDATAdir = $(localstatedir)
|
|
|
+ MYSQLSHAREdir = $(pkgdatadir)
|
|
|
+ MYSQLBASEdir = $(prefix)
|
|
|
+Index: mysys/default.c
|
|
|
+--- mysys/default.c.orig 2005-11-10 10:26:30 +0100
|
|
|
++++ mysys/default.c 2005-11-10 11:53:32 +0100
|
|
|
+@@ -48,7 +48,7 @@
|
|
|
+ #elif defined(__NETWARE__)
|
|
|
+ "sys:/etc/",
|
|
|
+ #else
|
|
|
+-"/etc/",
|
|
|
++ETCDIR,
|
|
|
+ #endif
|
|
|
+ #ifdef DATADIR
|
|
|
+ DATADIR,
|
|
|
+Index: libmysql/Makefile.in
|
|
|
+--- libmysql/Makefile.in.orig 2005-10-10 00:47:20 +0200
|
|
|
++++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100
|
|
|
+@@ -213,6 +213,7 @@
|
|
|
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
|
|
|
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
|
|
|
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
|
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
|
|
|
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
|
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
|
|
|
+
|
|
|
+@@ -420,6 +421,7 @@
|
|
|
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
+ $(openssl_includes) @ZLIB_INCLUDES@
|
|
|
+
|
|
|
++MYSQLETCdir = $(sysconfdir)
|
|
|
+ MYSQLDATAdir = $(localstatedir)
|
|
|
+ MYSQLSHAREdir = $(pkgdatadir)
|
|
|
+ MYSQLBASEdir = $(prefix)
|
|
|
+Index: libmysql_r/Makefile.in
|
|
|
+--- libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200
|
|
|
++++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100
|
|
|
+@@ -211,6 +211,7 @@
|
|
|
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
|
|
|
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
|
|
|
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
|
|
|
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
|
|
|
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
|
|
|
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
|
|
|
+
|
|
|
+@@ -419,6 +420,7 @@
|
|
|
+ -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|
|
+ $(openssl_includes) @ZLIB_INCLUDES@
|
|
|
+
|
|
|
++MYSQLETCdir = $(sysconfdir)
|
|
|
+ MYSQLDATAdir = $(localstatedir)
|
|
|
+ MYSQLSHAREdir = $(pkgdatadir)
|
|
|
+ MYSQLBASEdir = $(prefix)
|