Changelog:
Move the Wine internal headers to includedir/wine/wine rather than
includedir/wine.
Vincent
Index: wine/include/Makefile.in
===================================================================
RCS file: /home/wine/wine/include/Makefile.in,v
retrieving revision 1.93
diff -u -r1.93 Makefile.in
--- wine/include/Makefile.in 13 Aug 2003 01:27:48 -0000 1.93
+++ wine/include/Makefile.in 1 Sep 2003 17:20:52 -0000
@@ -281,10 +281,10 @@
idl: $(IDL_SRCS:.idl=.h)
install::
- $(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys
+ $(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys $(includedir)/wine
for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done
for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done
- for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/$$f; done
+ for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/wine/$$f; done
# Don't just do a rm -rf on $(includedir) -- don't want to wipe out
# anything extra the user may have put there.
Index: wine/tools/winegcc.c
===================================================================
RCS file: /home/wine/wine/tools/winegcc.c,v
retrieving revision 1.19
diff -u -r1.19 winegcc.c
--- wine/tools/winegcc.c 20 Aug 2003 04:15:02 -0000 1.19
+++ wine/tools/winegcc.c 1 Sep 2003 20:04:55 -0000
@@ -282,6 +282,7 @@
gcc_argv[i++] = "-D__MSVCRT__";
}
gcc_argv[i++] = "-I" INCLUDEDIR "/windows";
+ gcc_argv[i++] = "-I" INCLUDEDIR;
}
gcc_argv[i++] = "-DWIN32";
gcc_argv[i++] = "-D_WIN32";
Index: wine/tools/wrc/wrc.c
===================================================================
RCS file: /home/wine/wine/tools/wrc/wrc.c,v
retrieving revision 1.36
diff -u -r1.36 wrc.c
--- wine/tools/wrc/wrc.c 18 Aug 2003 19:48:58 -0000 1.36
+++ wine/tools/wrc/wrc.c 1 Sep 2003 17:19:39 -0000
@@ -360,6 +360,7 @@
{
wpp_add_include_path(INCLUDEDIR"/msvcrt");
wpp_add_include_path(INCLUDEDIR"/windows");
+ wpp_add_include_path(INCLUDEDIR);
}
/* Check for input file on command-line */
