makefiles: Rename the SRCDIR, TOPSRCDIR and TOPOBJDIR variables to follow autoconf conventions.
diff --git a/Make.vars.in b/Make.vars.in
index 9bc1b0d8..f04a088 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -13,9 +13,9 @@
includedir = @includedir@/wine
dlldir = @libdir@/wine
fakedlldir = $(dlldir)/fakedlls
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = @top_builddir@
-SRCDIR = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+srcdir = @srcdir@
VPATH = @srcdir@
SHELL = /bin/sh
RM = rm -f
@@ -55,11 +55,11 @@
CROSSTARGET = @CROSSTARGET@
CROSSAR = $(CROSSTARGET)-ar
CROSSRANLIB = $(CROSSTARGET)-ranlib
-MKINSTALLDIRS = $(TOPSRCDIR)/tools/mkinstalldirs -m 755
-WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
-BUILDIMAGE = $(TOPSRCDIR)/tools/buildimage
-C2MAN = $(TOPSRCDIR)/tools/c2man.pl
-RUNTEST = $(TOPSRCDIR)/tools/runtest
+MKINSTALLDIRS = $(top_srcdir)/tools/mkinstalldirs -m 755
+WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check
+BUILDIMAGE = $(top_srcdir)/tools/buildimage
+C2MAN = $(top_srcdir)/tools/c2man.pl
+RUNTEST = $(top_srcdir)/tools/runtest
MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT)
@@ -68,11 +68,11 @@
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)
WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT)
WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
-LIBPORT = $(TOPOBJDIR)/libs/port/libwine_port.a
-LIBWPP = $(TOPOBJDIR)/libs/wpp/libwpp.a
-LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine
-WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) @UNWINDFLAGS@
-CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) --lib-suffix=.cross.a
+LIBPORT = $(top_builddir)/libs/port/libwine_port.a
+LIBWPP = $(top_builddir)/libs/wpp/libwpp.a
+LIBWINE = -L$(top_builddir)/libs/wine -lwine
+WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@
+CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a
LDPATH = @LDPATH@
LDRPATH_INSTALL = @LDRPATH_INSTALL@
LDRPATH_LOCAL = @LDRPATH_LOCAL@
