aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-05-31 00:23:01 +0000
committerGerald Combs <gerald@wireshark.org>2006-05-31 00:23:01 +0000
commitb15974d094e96ced61fefeff35be96add2b6e7a4 (patch)
tree476bdd5efe70987b1f7252072e7a1b6a0adf849f /packaging
parent6deb90af7b1eee58fe564ebeaee57066bca508e2 (diff)
libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here. It compiles OK on OS X, but hasn't been tested anywhere else. svn path=/trunk/; revision=18260
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake4
-rw-r--r--packaging/nsis/wireshark.nsi4
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index f5ace8254c..ef63336beb 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -111,8 +111,8 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!IF "$(MAKENSIS_MODERN_UI)" != ""
/DMAKENSIS_MODERN_UI=$(MAKENSIS_MODERN_UI) \
!ENDIF
-!IF "$(ENABLE_LIBETHEREAL)" != ""
- /DENABLE_LIBETHEREAL=$(ENABLE_LIBETHEREAL) \
+!IF "$(ENABLE_LIBWIRESHARK)" != ""
+ /DENABLE_LIBWIRESHARK=$(ENABLE_LIBWIRESHARK) \
!ENDIF
!IFDEF GTK1_DIR
/DGTK1_DIR=$(GTK1_DIR) \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index eb29a89c0a..13533f5c97 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -304,8 +304,8 @@ SetShellVarContext all
SetOutPath $INSTDIR
File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll"
-!ifdef ENABLE_LIBETHEREAL
-File "..\..\epan\libethereal.dll"
+!ifdef ENABLE_LIBWIRESHARK
+File "..\..\epan\libwireshark.dll"
!endif
File "${GLIB_DIR}\bin\libglib-2.0-0.dll"
File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"