[PATCH 1/7] Fix non-expansion of some Makefile variables

[Thiago Macieira]

Apparently SED isn't set on Windows-native Makefiles. And for some
reason, $(CC) wasn't getting expanded properly -- it expanded to "cc",
even though it is set at the beginning of the Makefile to "gcc".

Reported-by: Lubomir I. Ivanov
Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 subsurface-install.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsurface-install.pri b/subsurface-install.pri
index 5fcc158..ead1fd2 100644
--- a/subsurface-install.pri
+++ b/subsurface-install.pri
@@ -53,8 +53,8 @@ mac {
     install.depends += qt_conf
 
     !win32-msvc* {
-        #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$(CC) -dumpmachine`-objdump
-        dlls.commands += PATH=\$\$PATH:`$(CC) -print-search-dirs | $(SED) -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'`
+        #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$$QMAKE_CC -dumpmachine`-objdump
+        dlls.commands += PATH=\$\$PATH:`$$QMAKE_CC -print-search-dirs | sed -nE \'/^libraries: =/{s///;s,/lib/?(:|\\\$\$),/bin\\1,g;p;q;}\'`
         dlls.commands += perl $$PWD/scripts/win-ldd.pl $(DESTDIR_TARGET)
 
         for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
-- 
1.7.11.7