diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
| commit | ea4f5189975b3a8423f75e85bb7be79bae851f96 (patch) | |
| tree | 9bcd4cbdb29cd9083862cb081c2a0ec6df3f2efc /packaging/nsis/Makefile.nmake | |
| parent | b34abdc9435e8127c42ca842cd2d5429c45ccc46 (diff) | |
Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)
Now qtshark is (normally) available in automated build !
svn path=/trunk/; revision=45485
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 7446b9f126..6fedf591f9 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -196,7 +196,10 @@ NSIS_FLAGS=\ /DGEOIP_DIR=$(GEOIP_DIR) \ !ENDIF !IFDEF HHC_DIR - /DHHC_DIR="$(HHC_DIR)" + /DHHC_DIR="$(HHC_DIR)" \ +!ENDIF +!IF EXIST("..\..\wireshark-qt\qtshark.exe") + /DQT_DIR="..\..\wireshark-qt" \ !ENDIF $(STAGING_DIR)\uninstall.exe : $(NSI) |