Hello all,
attached patch fixes makefile and script for the nsis installer.
please check in.
BTW, did anyone tell Gerald how to build the next release? :)
Call "nmake -f makefile.nmake packaging" within ethereal's root
directory, not in the nsis subdirectory!
Best Regards,
Lars Roland
Index: nsis/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/Makefile.nmake,v
retrieving revision 1.34
diff -u -r1.34 Makefile.nmake
--- nsis/Makefile.nmake 26 Jan 2004 21:12:41 -0000 1.34
+++ nsis/Makefile.nmake 3 Feb 2004 13:40:19 -0000
@@ -9,7 +9,15 @@
include ../../config.nmake
-EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
+!IFDEF GTK1
+DEST=ethereal
+GTK_DIR=$(GTK1_DIR)
+!ELSE
+DEST=ethereal2
+GTK_DIR=$(GTK2_DIR)
+!ENDIF
+
+EXE=../../$(DEST).exe ../../tethereal.exe ../../editcap.exe \
../../text2pcap.exe ../../mergecap.exe
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
DOC=../../doc/ethereal.html \
@@ -49,16 +57,6 @@
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS)
-
-!IFDEF GTK1
-DEST=ethereal
-GTK_DIR=$(GTK1_DIR)
-!ELSE
-DEST=ethereal2
-GTK_DIR=$(GTK2_DIR)
-!ENDIF
-
-
$(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake
$(MAKENSIS) \
!IF "$(MAKENSIS_MODERN_UI)" != ""
@@ -88,6 +86,7 @@
clean:
rm -f ethereal-setup-$(VERSION).exe
+ rm -f ethereal2-setup-$(VERSION).exe
distclean: clean
Index: nsis/ethereal.nsi
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/ethereal.nsi,v
retrieving revision 1.42
diff -u -r1.42 ethereal.nsi
--- nsis/ethereal.nsi 3 Feb 2004 01:06:21 -0000 1.42
+++ nsis/ethereal.nsi 3 Feb 2004 13:40:19 -0000
@@ -275,7 +275,7 @@
Delete "$SMPROGRAMS\Ethereal\Ethereal Web Site.lnk"
WriteINIStr "$SMPROGRAMS\Ethereal\Ethereal Web Site.url" \
"InternetShortcut" "URL" "http://www.ethereal.com/";
-CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe"
+CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\${DEST}.exe"
CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Manual.lnk" "$INSTDIR\ethereal.html"
CreateShortCut "$SMPROGRAMS\Ethereal\Display Filters Manual.lnk" "$INSTDIR\ethereal-filter.html"
CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall.lnk" "$INSTDIR\uninstall.exe"
@@ -285,7 +285,7 @@
Section "Desktop Icon" SecDesktopIcon
;-------------------------------------------
-CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\Ethereal.exe"
+CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\${DEST}.exe"
SectionEnd
Section "Uninstall"
