ChangeLog
Small cleanups to match current build process.
Index: tools/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/Makefile.in,v
retrieving revision 1.28
diff -u -r1.28 Makefile.in
--- tools/Makefile.in 13 Dec 2002 00:38:42 -0000 1.28
+++ tools/Makefile.in 14 Dec 2002 19:14:48 -0000
@@ -1,4 +1,4 @@
-DEFS = -DNO_LIBWINE -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" -DINCLUDEDIR="\"$(includedir)\""
+DEFS = -DNO_LIBWINE -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" -DINCLUDEDIR="\"$(includedir)\"" -DBINDIR="\"$(bindir)/\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: tools/winewrap.c
===================================================================
RCS file: /var/cvs/wine/tools/winewrap.c,v
retrieving revision 1.1
diff -u -r1.1 winewrap.c
--- tools/winewrap.c 13 Dec 2002 00:38:42 -0000 1.1
+++ tools/winewrap.c 14 Dec 2002 19:35:54 -0000
@@ -120,10 +120,10 @@
}
if ((pid = fork()) == 0) execvp(argv[0], argv);
- else if (wait(&status) > 0)
+ else if (waitpid(pid, &status, 0) > 0)
{
- if (WEXITSTATUS(status) == 0) return;
- else error("%s failed.", argv[0]);
+ if (WIFEXITED(status) && WEXITSTATUS(status) == 0) return;
+ error("%s failed.", argv[0]);
}
perror("Error:");
exit(1);
@@ -168,7 +168,6 @@
if (argv[i][2]) library = argv[i]+ 2;
else if (i + 1 < argc) library = argv[++i];
else error("The -l switch takes an argument\n.");
- if (strcmp(library, "winspool") == 0) library = "winspool.drv";
lib_files = realloc( lib_files, (nb_lib_files+1) * sizeof(*lib_files) );
lib_files[nb_lib_files++] = strdup(library);
break;
@@ -197,7 +196,7 @@
/* build winebuild's argument list */
spec_args = malloc( (nb_lib_files + nb_obj_files + 20) * sizeof (char *) );
j = 0;
- spec_args[j++] = "winebuild";
+ spec_args[j++] = BINDIR "winebuild";
spec_args[j++] = "-fPIC";
spec_args[j++] = "-o";
spec_args[j++] = strmake("%s.c", spec_name);
--
Dimi.
