out of treee builds broken

Alexandre Julliard julliard at winehq.org
Wed Nov 19 15:47:28 CST 2003


Marcus Meissner <meissner at suse.de> writes:

> It looks for authors.c in the srcdir, not in the objdir.

This should fix it:

Index: tools/winebuild/utils.c
===================================================================
RCS file: /opt/cvs-commit/wine/tools/winebuild/utils.c,v
retrieving revision 1.17
diff -u -p -r1.17 utils.c
--- tools/winebuild/utils.c	22 Sep 2003 19:27:56 -0000	1.17
+++ tools/winebuild/utils.c	19 Nov 2003 21:45:22 -0000
@@ -176,18 +176,19 @@ void dump_bytes( FILE *outfile, const un
 FILE *open_input_file( const char *srcdir, const char *name )
 {
     char *fullname;
-    FILE *file;
+    FILE *file = fopen( name, "r" );
 
-    if (srcdir)
+    if (!file && srcdir)
     {
         fullname = xmalloc( strlen(srcdir) + strlen(name) + 2 );
         strcpy( fullname, srcdir );
         strcat( fullname, "/" );
         strcat( fullname, name );
+        file = fopen( fullname, "r" );
     }
     else fullname = xstrdup( name );
 
-    if (!(file = fopen( fullname, "r" ))) fatal_error( "Cannot open file '%s'\n", fullname );
+    if (!file) fatal_error( "Cannot open file '%s'\n", fullname );
     input_file_name = fullname;
     current_line = 1;
     return file;

-- 
Alexandre Julliard
julliard at winehq.com



More information about the wine-devel mailing list