diff options
| author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-10-16 11:46:17 +0000 |
|---|---|---|
| committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-10-16 11:46:17 +0000 |
| commit | 4878b7488bf872f9303250dfeae6aa5cadbdc2fd (patch) | |
| tree | fed8c4911860fdb172249610c0ff257dfc8a47c9 /packaging/nsis | |
| parent | a3340a4c2e8d297902e301ab9eedf517e05e27a6 (diff) | |
First support for Unix-to-DOS line termination translation by means of a small
perl script (unix2dos.pl). The NEWS file is now properly displayed on the
Notepad.exe text editor on a Windows box.
svn path=/trunk/; revision=12318
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 10 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 944330bf9f..ef3e3fa0be 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -9,6 +9,8 @@ include ../../config.nmake +UNIX2DOS=$(PERL) ../../tools/unix2dos.pl + !IFDEF GTK1_ONLY # define installer name and undefine GTK2_DIR to get a separate # installer for ethereal GTK1 version @@ -50,9 +52,9 @@ DOC=../../doc/ethereal.html \ ../../doc/mergecap.html \ ../../doc/capinfo.html \ ../../FAQ \ - ../../NEWS \ ../../README \ ../../README.win32 +DOC_dos=NEWS.txt GPL=../../COPYING HELP=../../help/toc \ ../../help/overview.txt \ @@ -81,9 +83,12 @@ PLUGINS=../../plugins/acn/acn.dll \ ../../plugins/rudp/rudp.dll \ ../../plugins/v5ua/v5ua.dll -DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS) +DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) +all: NEWS.txt $(DEST)-setup-$(VERSION).exe +NEWS.txt: ../../NEWS + $(UNIX2DOS) < ../../NEWS > NEWS.txt $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake $(MAKENSIS) \ @@ -126,6 +131,7 @@ clean: rm -f ethereal-setup-$(VERSION).exe rm -f ethereal-gtk1-setup-$(VERSION).exe rm -f ethereal-gtk2-setup-$(VERSION).exe + rm -f NEWS.txt distclean: clean diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 93e5d9af9f..312223cf57 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -263,7 +263,7 @@ File "..\..\README" File "..\..\README.win32" File "..\..\AUTHORS-SHORT" File "..\..\COPYING" -File /oname=NEWS.txt "..\..\NEWS" +File "NEWS.txt" File "..\..\manuf" File "..\..\doc\ethereal.html" File "..\..\doc\ethereal-filter.html" |