osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

instead of getting the user-guide.chm file always from the docbook dir, copy the more recent one from docbook or win32-libs\user-guide dir into local nsis dir, and use that one to build the installer - seems to be the cleanest way 

svn path=/trunk/; revision=20492
This commit is contained in:
Ulf Lamping 2007-01-19 00:10:22 +00:00
parent 67750fbc4d
commit 7fd3e76939
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/nsis/Makefile.nmake
View File

@ -102,7 +102,12 @@ all: NEWS.txt $(DEST)-setup-$(VERSION).exe
NEWS.txt: ../../NEWS
$(UNIX2DOS) < ../../NEWS > NEWS.txt
$(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
# fetch the latest available user-guide.chm version
user-guide.chm::
if exist ..\..\docbook\user-guide.chm xcopy ..\..\docbook\user-guide.chm . /Y /D
if exist $(WIRESHARK_LIBS)\user-guide\user-guide.chm xcopy $(WIRESHARK_LIBS)\user-guide\user-guide.chm . /Y /D
$(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake
$(MAKENSIS) \
/DDEST=$(DEST) \
/DMSVC_VARIANT=$(MSVC_VARIANT) \
@ -172,6 +177,7 @@ clean:
rm -f wireshark-gtk1-setup-$(VERSION).exe
rm -f wireshark-gtk2-setup-$(VERSION).exe
rm -f NEWS.txt
rm -f user-guide.chm
distclean: clean
rm -f wireshark-setup-*.exe

2
packaging/nsis/wireshark.nsi
View File

@ -852,7 +852,7 @@ Section "User's Guide" SecUsersGuide
SectionIn 1 2
!endif
SetOutPath $INSTDIR
File "..\..\docbook\user-guide.chm"
File "user-guide.chm"
SectionEnd
!endif