diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-07-06 01:10:00 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-06 01:11:45 -0700 |
| commit | 89dbf609d084eb353c048afa499aba953949f102 (patch) | |
| tree | e064822e109ee3a077a475a647900a09ce3aa5b3 /00100_all_default-dir-4.1.15.patch | |
| parent | Fix bug #271475, #elif not valid without an argument. Use #else instead. (diff) | |
| download | mysql-extras-89dbf609d084eb353c048afa499aba953949f102.tar.gz mysql-extras-89dbf609d084eb353c048afa499aba953949f102.tar.bz2 mysql-extras-89dbf609d084eb353c048afa499aba953949f102.zip | |
Need to use 5 digits of numbering now. LOTS of patches to track.
Diffstat (limited to '00100_all_default-dir-4.1.15.patch')
| -rw-r--r-- | 00100_all_default-dir-4.1.15.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/00100_all_default-dir-4.1.15.patch b/00100_all_default-dir-4.1.15.patch new file mode 100644 index 0000000..7d8124f --- /dev/null +++ b/00100_all_default-dir-4.1.15.patch @@ -0,0 +1,38 @@ +diff -Naur -Naur mysql-4.1.18.orig/libmysql/Makefile.shared mysql-4.1.18.new/libmysql/Makefile.shared +--- mysql-4.1.18.orig/libmysql/Makefile.shared 2006-01-27 16:26:16.000000000 +0000 ++++ mysql-4.1.18.new/libmysql/Makefile.shared 2006-04-10 17:36:35.000000000 +0000 +@@ -81,7 +81,8 @@ + $(target) + DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DDATADIR="\"$(MYSQLDATAdir)\"" \ +- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) ++ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ ++ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" $(target_defs) + + # The automatic dependencies miss this + #bmove_upp.lo: $(LTCHARSET_OBJS) +diff -Naur -Naur mysql-4.1.18.orig/mysys/default.c mysql-4.1.18.new/mysys/default.c +--- mysql-4.1.18.orig/mysys/default.c 2006-01-27 16:26:04.000000000 +0000 ++++ mysql-4.1.18.new/mysys/default.c 2006-04-10 18:51:43.000000000 +0000 +@@ -43,7 +43,9 @@ + /* Which directories are searched for options (and in which order) */ + + const char *default_directories[]= { +-#ifdef __WIN__ ++#ifdef DEFAULT_SYSCONFDIR ++DEFAULT_SYSCONFDIR, ++#elif defined(__WIN__) + "C:/", + #elif defined(__NETWARE__) + "sys:/etc/", +diff -Naur -Naur mysql-4.1.18.orig/mysys/Makefile.am mysql-4.1.18.new/mysys/Makefile.am +--- mysql-4.1.18.orig/mysys/Makefile.am 2006-01-27 16:26:26.000000000 +0000 ++++ mysql-4.1.18.new/mysys/Makefile.am 2006-04-10 17:35:42.000000000 +0000 +@@ -68,6 +68,7 @@ + -DDATADIR="\"$(MYSQLDATAdir)\"" \ + -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ + -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ ++ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ + @DEFS@ + + libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ |