diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-09-25 01:03:21 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-09-25 01:03:21 +0000 |
| commit | 410fdcd0651a7379f9c577e532adf0508ac65810 (patch) | |
| tree | e0e8f1588a39e174dda7e2996002e31265661711 | |
| parent | 4f9707469dc6edb8792ec811fecebb0f377fc58b (diff) | |
We're downloading the user-guide as part of the setup, so we might as well copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended".
svn path=/trunk/; revision=45116
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.nmake | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 5e49e4d738..bc5c8f4075 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1049,6 +1049,7 @@ install-generated-files: if exist wireshark.exe xcopy wireshark.exe $(INSTALL_DIR) /d if exist wireshark.pdb xcopy wireshark.pdb $(INSTALL_DIR) /d if exist wireshark.bsc xcopy wireshark.bsc $(INSTALL_DIR) /d + if exist $(UG_DIR)\user-guide.chm xcopy $(UG_DIR)\user-guide.chm $(INSTALL_DIR) /d if exist ".\docbook\user-guide.chm" xcopy ".\docbook\user-guide.chm" $(INSTALL_DIR) /d if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d diff --git a/config.nmake b/config.nmake index a3b6f1210a..a91597c25c 100644 --- a/config.nmake +++ b/config.nmake @@ -698,6 +698,11 @@ MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe" MAKENSIS_UNICODE="$(PROGRAM_FILES)\NSIS\Unicode\makensis.exe" # +# Recommended: Use the default user guide if not building one yourself. +# +UG_DIR=$(WIRESHARK_LIB_DIR)\user-guide + +# # Optional: To build the developers API documentation with doxygen and dot. # Currently experimental, outdated and incomplete. # |