Changeset 897


Ignore:
Timestamp:
Jul 18, 2011, 11:21:43 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

qmake: Proper fix to create install rules in Makefiles at first run.

The previous fix from Nokia (3d6f1ebf) did not actually work since it
would not take many things into account, e.g. the target extension,
shadow builds and so on.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/qmake/generators/makefile.cpp

    r887 r897  
    12941294                if(!dirstr.endsWith(Option::dir_sep))
    12951295                    dirstr += Option::dir_sep;
    1296                 bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
     1296                bool is_target = QFileInfo(wild) ==
     1297                    QFileInfo(Option::fixPathToTargetOS(QDir(Option::output_dir)
     1298                                                        .absoluteFilePath(var("DEST_TARGET"))));
    12971299                if(is_target || exists(wild)) { //real file or target
    12981300                    QString file = wild;
Note: See TracChangeset for help on using the changeset viewer.