From d3aceafdaa4e2aee060a09878f750718bb1e7df4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 11 Oct 2013 11:05:37 -0700 Subject: Fix non-expansion of some Makefile variables 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 Signed-off-by: Dirk Hohndel --- subsurface-install.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subsurface-install.pri b/subsurface-install.pri index 5fcc15883..ead1fd221 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)) { -- cgit v1.2.3-70-g09d2