AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use $(MAKEFILE) to refer to SUBDIRS' makefiles

Browse Source 
$(MAKEFILE) is our own file, and using it would wreak havoc if it was
named anything but Makefile.

Change-Id: I51cae2014a85399b409f18788f864ff2a82e493e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-05-16 14:54:21 +02:00
parent 91cf67c85d
commit 0e6ddb71cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/generators/makefile.cpp
View File

@ -2298,7 +2298,7 @@ MakefileGenerator::findSubDirsSubTargets() const
if(!project->isEmpty(fixedSubdir + ".makefile")) { if(!project->isEmpty(fixedSubdir + ".makefile")) {
st->makefile = project->first(fixedSubdir + ".makefile"); st->makefile = project->first(fixedSubdir + ".makefile");
} else { } else {
st->makefile = "$(MAKEFILE)"; st->makefile = "Makefile";
if(!st->profile.isEmpty()) { if(!st->profile.isEmpty()) {
QString basename = st->in_directory; QString basename = st->in_directory;
int new_slsh = basename.lastIndexOf(Option::dir_sep); int new_slsh = basename.lastIndexOf(Option::dir_sep);