diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-09-25 03:23:23 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-09-25 03:23:23 +0000 |
| commit | 005175c9c417d3d9463d8935e135235ab44ad2a5 (patch) | |
| tree | 170a83c4e3447fbee40d84a56594d4b77509cd76 | |
| parent | a09f3c2e4f8450967adf275d01a047c00ca80002 (diff) | |
Revert 45116. Developer's probably don't want the user-guide.chm that they get from the setup step as it's not going to be up-to-date.
svn path=/trunk/; revision=45121
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.nmake | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index bc5c8f4075..5e49e4d738 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1049,7 +1049,6 @@ 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 a91597c25c..a3b6f1210a 100644 --- a/config.nmake +++ b/config.nmake @@ -698,11 +698,6 @@ 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. # |