From 184c40a397e914752b6b06e885b58b53f0700ea1 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 11 Dec 2002 01:30:14 +0000 Subject: [PATCH] Try to open source file in current directory first in case it is a generated file. --- tools/makedep.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index bf51ba0e4dd..cd5e223fc30 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -189,18 +189,24 @@ static FILE *open_src_file( INCL_FILE *pFile ) { FILE *file; + /* first try name as is */ + if ((file = fopen( pFile->name, "r" ))) + { + pFile->filename = xstrdup( pFile->name ); + return file; + } + /* now try in source dir */ if (SrcDir) { pFile->filename = xmalloc( strlen(SrcDir) + strlen(pFile->name) + 2 ); strcpy( pFile->filename, SrcDir ); strcat( pFile->filename, "/" ); strcat( pFile->filename, pFile->name ); + file = fopen( pFile->filename, "r" ); } - else pFile->filename = xstrdup( pFile->name ); - - if (!(file = fopen( pFile->filename, "r" ))) + if (!file) { - perror( pFile->filename ); + perror( pFile->name ); exit(1); } return file;