diff options
| author | Karl Berry <karl@freefriends.org> | 2010-02-01 19:41:33 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2010-02-01 19:41:33 +0000 |
| commit | f3e45a772d199f398f301984a90991b4199cee23 (patch) | |
| tree | b1988cdc2f3e4d759a1db5b47b52f6fd85d61243 /Build/source/texk/web2c/lib | |
| parent | a7d0d5b80f2b788f11ed7b8c286d46aa26f3a38d (diff) | |
mention that TEXMFOUTPUT is also used for input, with no automatic suffix extending done
git-svn-id: svn://tug.org/texlive/trunk@16894 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/lib')
| -rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/lib/Makefile.in | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/lib/openclose.c | 23 |
3 files changed, 17 insertions, 17 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index bf3cfd722b9..ce94b027977 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Karl Berry <karl@tug.org> + + * openclose.c (open_input): do not try prepending TEXMFOUTPUT for + reading if the filename is absolute. + 2010-01-24 Peter Breitenlohner <peb@mppmu.mpg.de> * texmfmp.c (mk_shellcmdlist): Declare string param as const. diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 4f473047db6..5baf0602ed5 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -60,7 +60,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ @@ -120,6 +119,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CXXLD = @CXXLD@ +CXX_HACK_DEPS = @CXX_HACK_DEPS@ +CXX_HACK_LIBS = @CXX_HACK_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -222,9 +223,6 @@ YFLAGS = @YFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ -ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@ -ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@ -ZZIPLIB_LIBS = @ZZIPLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index e82b3215d6c..33b2ef985bc 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -121,24 +121,21 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) free(fullnameoffile); fullnameoffile = NULL; - /* Handle -output-directory. - FIXME: We assume that it is OK to look here first. Possibly it - would be better to replace lookups in "." with lookups in the - output_directory followed by "." but to do this requires much more - invasive surgery in libkpathsea. */ - /* FIXME: This code assumes that the filename of the input file is - not an absolute filename. */ - if (output_directory) { - fname = concat3(output_directory, DIR_SEP_STRING, nameoffile + 1); - *f_ptr = fopen(fname, fopen_mode); + /* Look in -output-directory first, if the filename is not + absolute. This is because .aux and other such files will get + written to the output directory, and we have to be able to read + them from there. We only look for the name as-is. */ + if (output_directory && kpse_absolute_p (nameoffile+1, false)) { + fname = concat3 (output_directory, DIR_SEP_STRING, nameoffile + 1); + *f_ptr = fopen (fname, fopen_mode); if (*f_ptr) { - free(nameoffile); + free (nameoffile); namelength = strlen (fname); - nameoffile = (string)xmalloc (namelength + 2); + nameoffile = (string) xmalloc (namelength + 2); strcpy (nameoffile + 1, fname); fullnameoffile = fname; } else { - free(fname); + free (fname); } } |