diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-07 18:30:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-07 18:30:21 +0000 |
| commit | 6fea3ab734ef54289574508539ef01ba62093886 (patch) | |
| tree | 50514b52343f220dcfc60b7ef65912f40348cf54 /ui | |
| parent | a2452d6926d98c35a6339ad9941123000736d7b3 (diff) | |
Make sure we copy our support files to DESTDIR.
svn path=/trunk/; revision=51194
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/QtShark.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 35744c5750..052f49fc3d 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -312,8 +312,13 @@ EXTRA_BINFILES = \ # http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output unix: { - EXTRA_BINFILES += \ - ../../dumpcap + exists(../../.libs/dumpcap) { + EXTRA_BINFILES += \ + ../../.libs/dumpcap + } else:exists(../../dumpcap) { + EXTRA_BINFILES += \ + ../../dumpcap + } exists(../../epan/.libs/libw*) { EXTRA_BINFILES += \ @@ -329,7 +334,7 @@ unix: { } unix:!macx { for(FILE,EXTRA_BINFILES){ - QMAKE_POST_LINK += $$quote(cp $${FILE} .$$escape_expand(\\n\\t)) + QMAKE_POST_LINK += $$quote(cp $${FILE} $${DESTDIR}$$escape_expand(\\n\\t)) } } # qmake 2.01a / Qt 4.7.0 doesn't set DESTDIR on OS X. |