diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-06-13 21:03:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-06-13 21:03:54 +0000 |
| commit | bcb021c25f6339b30155be9bc347d92ad3758754 (patch) | |
| tree | e17d6076dfd412d0a98ce7501a2b036cc4461339 /packaging/nsis/Makefile.nmake | |
| parent | c548b1097f0eeb498a8d7cceee50d0253bfdfada (diff) | |
Define STAGING_DIR and use it in various places instead of hard-coding
"..\.." or "..\..\wireshark-gtk2".
svn path=/trunk/; revision=43239
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 92cdcf1c3b..87788bdf99 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -12,6 +12,8 @@ include ../../config.nmake include Custom.nmake +STAGING_DIR=..\..\$(INSTALL_DIR) + EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK_DIR ../../wireshark.exe \ @@ -29,19 +31,19 @@ DOC=../../doc/ws.css \ ../../doc/tshark.html \ ../../doc/wireshark-filter.html \ ../../doc/wireshark.html \ - ../../$(INSTALL_DIR)/COPYING.txt \ - ../../$(INSTALL_DIR)/NEWS.txt \ - ../../$(INSTALL_DIR)/README.txt \ - ../../$(INSTALL_DIR)/README.windows.txt + $(STAGING_DIR)/COPYING.txt \ + $(STAGING_DIR)/NEWS.txt \ + $(STAGING_DIR)/README.txt \ + $(STAGING_DIR)/README.windows.txt GPL=../../COPYING -HELP=../../$(INSTALL_DIR)/help/capture_filters.txt \ - ../../$(INSTALL_DIR)/help/capturing.txt \ - ../../$(INSTALL_DIR)/help/display_filters.txt \ - ../../$(INSTALL_DIR)/help/faq.txt \ - ../../$(INSTALL_DIR)/help/getting_started.txt \ - ../../$(INSTALL_DIR)/help/overview.txt \ - ../../$(INSTALL_DIR)/help/toc +HELP=$(STAGING_DIR)/help/capture_filters.txt \ + $(STAGING_DIR)/help/capturing.txt \ + $(STAGING_DIR)/help/display_filters.txt \ + $(STAGING_DIR)/help/faq.txt \ + $(STAGING_DIR)/help/getting_started.txt \ + $(STAGING_DIR)/help/overview.txt \ + $(STAGING_DIR)/help/toc PLUGINS= \ ../../plugins/asn1/asn1.dll \ @@ -88,6 +90,7 @@ user-guide.chm:: NSIS_FLAGS=\ /DMAKEDIR=$(MAKEDIR) \ + /DSTAGING_DIR=$(STAGING_DIR) \ /DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ /DWIRESHARK_LIB_DIR=$(WIRESHARK_LIB_DIR) \ |