diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-07-24 23:59:42 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-07-24 23:59:42 +0000 |
| commit | f25ae3613a8a5aaed5a45422652a477822dbd2a8 (patch) | |
| tree | a72849c0466bfa294a1780504bdfcb4d9d408ada /packaging/nsis/Makefile.nmake | |
| parent | b63bb802abd0dd621417632bcc416bb9680eb54b (diff) | |
Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.
svn path=/trunk/; revision=43976
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index de162a24cc..f4823a7063 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -198,15 +198,15 @@ NSIS_FLAGS=\ /DHHC_DIR="$(HHC_DIR)" !ENDIF -..\..\uninstall.exe : $(NSI) +$(STAGING_DIR)\uninstall.exe : $(NSI) rm -f $(UNINSTALL_INSTALLER) $(MAKENSIS) $(NSIS_FLAGS) uninstall.nsi $(UNINSTALL_INSTALLER) rm -f $(UNINSTALL_INSTALLER) -uninstall-exe : ..\..\uninstall.exe +uninstall-exe : $(STAGING_DIR)\uninstall.exe -wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake ..\..\uninstall.exe +wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(STAGING_DIR)\uninstall.exe $(MAKENSIS) $(NSIS_FLAGS) wireshark.nsi clean: |