diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-02-10 19:45:43 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-02-10 19:45:43 +0000 |
| commit | a22790ae51c66890f0f1784aef205622b190ad73 (patch) | |
| tree | b24ba35ba264b2465453f9106a2a588546b443d5 | |
| parent | af28be359887b8575db28fb812c2344b9d55268f (diff) | |
Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.
svn path=/trunk/; revision=47615
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 4cb6870b36..881f0bccaf 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -211,8 +211,8 @@ NSIS_FLAGS=\ !IFDEF HHC_DIR /DHHC_DIR="$(HHC_DIR)" \ !ENDIF -!IF EXIST("..\..\wireshark-qt\qtshark.exe") - /DQT_DIR="..\..\wireshark-qt" \ +!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") + /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF $(STAGING_DIR)\uninstall.exe : $(NSI) diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 03fb3386d9..3b3f2bf208 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -25,8 +25,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # - - QT += core gui macx { @@ -37,7 +35,16 @@ macx { TEMPLATE = app -QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist +TOP_SRCDIR = "$$PWD/../.." + +CONFIG(debug, debug|release) { + DESTDIR = "$${TOP_SRCDIR}/wireshark-qt-debug" +} +CONFIG(release, debug|release) { + DESTDIR = "$${TOP_SRCDIR}/wireshark-qt-release" +} + +QMAKE_INFO_PLIST = "$$PWD/../../packaging/macosx/Info.plist" xxx { message( ) @@ -122,8 +129,6 @@ win32 { error("Can't find config.pri. Have you run 'nmake -f Makefile.nmake' two directories up?") } - DESTDIR = ../../wireshark-qt - !wireshark_manifest_info_required { CONFIG -= embed_manifest_dll CONFIG -= embed_manifest_exe @@ -313,7 +318,7 @@ unix:!macx { # qmake 2.01a / Qt 4.7.0 doesn't set DESTDIR on OS X. macx { for(FILE,EXTRA_BINFILES){ - QMAKE_POST_LINK += $$quote(cp $${FILE} $${TARGET}.app/Contents/MacOS$$escape_expand(\\n\\t)) + QMAKE_POST_LINK += $$quote(cp $${FILE} $${DESTDIR}/$${TARGET}.app/Contents/MacOS$$escape_expand(\\n\\t)) } } |