Attached are patches to the NSIS install build to cause it to use the
NET_SNMP_DIR definition in config.nmake, rather than force the builder
to update the NSIS config file by hand.
Stephen Shelley
------------------------------------------------------------------------
Women and cats will do as they please,
and men and dogs should relax and get used to the idea.
- Robert A. Heinlein
Index: ethereal/packaging/nsis/ethereal.nsi
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/ethereal.nsi,v
retrieving revision 1.10
diff -u -r1.10 ethereal.nsi
--- ethereal/packaging/nsis/ethereal.nsi 9 Apr 2003 18:58:37 -0000 1.10
+++ ethereal/packaging/nsis/ethereal.nsi 17 Apr 2003 23:07:59 -0000
@@ -152,9 +152,7 @@
Section "SNMP MIBs"
;-------------------------------------------
SetOutPath $INSTDIR\snmp\mibs
-; NOTE: You'll have to specify the path to the Net-SNMP mibs directory
-; on your system here.
-File "..\..\..\libs\net-snmp-5.0.6\mibs\*.txt"
+File "${NET_SNMP_DIR}\mibs\*.txt"
SectionEnd
; SectionDivider
Index: ethereal/packaging/nsis/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/Makefile.nmake,v
retrieving revision 1.15
diff -u -r1.15 Makefile.nmake
--- ethereal/packaging/nsis/Makefile.nmake 28 Jan 2003 22:18:06 -0000 1.15
+++ ethereal/packaging/nsis/Makefile.nmake 17 Apr 2003 23:08:47 -0000
@@ -33,7 +33,7 @@
DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(PLUGINS)
ethereal-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES)
- $(MAKENSIS) /DVERSION=$(VERSION) /DWTAP_VERSION=$(WTAP_VERSION) /DCOMMON_FILES_GNU=$(COMMON_FILES_GNU) ethereal.nsi
+ $(MAKENSIS) /DVERSION=$(VERSION) /DWTAP_VERSION=$(WTAP_VERSION) /DCOMMON_FILES_GNU=$(COMMON_FILES_GNU) /DNET_SNMP_DIR=$(NET_SNMP_DIR) ethereal.nsi
clean:
rm -f ethereal-setup-$(VERSION).exe
