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 /packaging/nsis/Makefile.nmake | |
| 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
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 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) |