fix QMAKE_SUBSTITUTES with shadow builds

still doesn't work for nested directories, but that's because
fileFixify() is plain broken.

on the way, remove a superfluous check: we know that the input file name
ends with .in - three lines up we made sure it does.

Reviewed-by: joerg

1 files changed, 3 insertions, 3 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 45a96f51f8..851e5875d7 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -471,9 +471,9 @@ MakefileGenerator::init()
                          subs.at(i).toLatin1().constData());
                 continue;
             }
-            QFile in(fileFixify(subs.at(i))), out(fileInfo(subs.at(i)).fileName());
-            if(out.fileName().endsWith(".in"))
-                out.setFileName(out.fileName().left(out.fileName().length()-3));
+            QFile in(fileFixify(subs.at(i)));
+            QFile out(fileFixify(subs.at(i).left(subs.at(i).length()-3),
+                                 qmake_getpwd(), Option::output_dir));
             if(in.open(QFile::ReadOnly)) {
                 QString contents;
                 QStack<int> state;