diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-11 13:01:30 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-10-11 13:01:30 +0000 |
| commit | 53e76f5a81d0aa3a5ecb9d43383395ba93c0c28e (patch) | |
| tree | da655c0b68e1f05f14cef22c39d8eb31f2a3cbd1 /Build | |
| parent | c8e5c978d6003a7b392602d9f960b4fe038d234e (diff) | |
bibtex8, bibtexu: Better handling of default CSFILE
git-svn-id: svn://tug.org/texlive/trunk@27944 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/bibtex8/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/bibtex8/utils.c | 5 | ||||
| -rw-r--r-- | Build/source/texk/bibtexu/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/bibtexu/utils.c | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/Build/source/texk/bibtex8/ChangeLog b/Build/source/texk/bibtex8/ChangeLog index 4c2d16a0488..c530050fb40 100644 --- a/Build/source/texk/bibtex8/ChangeLog +++ b/Build/source/texk/bibtex8/ChangeLog @@ -1,3 +1,8 @@ +2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to + "/nonesuch" in ../kpathsea/paths.h; so we use CSF_FILE_ENVVAR. + 2012-04-12 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * bibtex-2.c: Do not check whether Glob_Str_Size > Buf_Size, diff --git a/Build/source/texk/bibtex8/utils.c b/Build/source/texk/bibtex8/utils.c index adf605cefea..cb4085bf6aa 100644 --- a/Build/source/texk/bibtex8/utils.c +++ b/Build/source/texk/bibtex8/utils.c @@ -1719,8 +1719,11 @@ int c8read_csf (void) */ if (Str_csfile == NULL) { #ifdef KPATHSEA +#ifndef CSF_FILE_ENVVAR +#define CSF_FILE_ENVVAR "BIBTEX_CSFILE" +#endif /* Default value from environment or texmf.cnf */ - Str_csfile = kpse_var_value (DEFAULT_BIBTEX_CSFILE); + Str_csfile = kpse_var_value (CSF_FILE_ENVVAR); if (Str_csfile == NULL) /* Use fallback value */ Str_csfile = xstrdup ("88591lat.csf"); #else diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index 07f61c0c0db..641564910b2 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -1,3 +1,8 @@ +2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to + "/nonesuch" in ../kpathsea/paths.h; so we use CSF_FILE_ENVVAR. + 2012-08-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * bibtex.c : Change order of inclusion of headers to avoid warnings. diff --git a/Build/source/texk/bibtexu/utils.c b/Build/source/texk/bibtexu/utils.c index ee272b211da..675d3c38546 100644 --- a/Build/source/texk/bibtexu/utils.c +++ b/Build/source/texk/bibtexu/utils.c @@ -1746,8 +1746,11 @@ int c8read_csf (void) */ if (Str_csfile == NULL) { #ifdef KPATHSEA +#ifndef CSF_FILE_ENVVAR +#define CSF_FILE_ENVVAR "BIBTEX_CSFILE" +#endif /* Default value from environment or texmf.cnf */ - Str_csfile = kpse_var_value (DEFAULT_BIBTEX_CSFILE); + Str_csfile = kpse_var_value (CSF_FILE_ENVVAR); if (Str_csfile == NULL) /* Use fallback value */ Str_csfile = xstrdup ("88591lat.csf"); #else |