Alexandre Julliard : makefiles: Add makefile variables for the winegcc parameters.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 658057ae0b7ec0230c179616ac2d7228e5a7eeae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=658057ae0b7ec0230c179616ac...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Feb 10 10:57:53 2014 +0100

makefiles: Add makefile variables for the winegcc parameters.

---

 Make.vars.in              |    2 ++
 tools/winegcc/Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Make.vars.in b/Make.vars.in
index 684d673..ee8ee39 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -18,6 +18,8 @@ SHELL           = /bin/sh
 RM              = rm -f
 MV              = mv
 CC              = @CC@
+CXX             = @CXX@
+CPPBIN          = @CPPBIN@
 CROSSCC         = @CROSSCC@
 CFLAGS          = @CFLAGS@
 CPPFLAGS        = @CPPFLAGS@
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index bb7e4a2..3975ca5 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -14,8 +14,8 @@ winegcc_EXTRADEFS = \
 	-DDLLDIR="\"${dlldir}\"" \
 	-DLIBDIR="\"${libdir}\"" \
 	-DCC="\"$(CC)\"" \
-	-DCPP="\"@CPPBIN@\"" \
-	-DCXX="\"@CXX@\"" \
+	-DCPP="\"$(CPPBIN)\"" \
+	-DCXX="\"$(CXX)\"" \
 	-DPRELINK="\"$(PRELINK)\""
 
 winegcc$(EXEEXT): winegcc.o utils.o