diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-07-09 16:43:32 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-07-09 23:44:01 +0000 |
| commit | 2fbedef5d13194c693ed6d0e773de249a6698278 (patch) | |
| tree | e3df9bd457fc699f6584d79148a4549529482f1e | |
| parent | 28719a4e4e01b478889dab9611fed517e506360e (diff) | |
A few more changes to remove "lib" from "libwsutil" on Windows.
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451
Reviewed-on: https://code.wireshark.org/review/2970
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | image/libwsutil.rc.in | 4 | ||||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/image/libwsutil.rc.in b/image/libwsutil.rc.in index 22209255bb..ad3867d316 100644 --- a/image/libwsutil.rc.in +++ b/image/libwsutil.rc.in @@ -20,9 +20,9 @@ BEGIN VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" VALUE "FileDescription", "Wireshark utility library\0" VALUE "FileVersion", "@VERSION@\0" - VALUE "InternalName", "libwsutil @VERSION@\0" + VALUE "InternalName", "wsutil @VERSION@\0" VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" - VALUE "OriginalFilename", "libwsutil.dll\0" + VALUE "OriginalFilename", "wsutil.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" END diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 30f74ab153..980f72afe9 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -17,7 +17,7 @@ EXE=../../tshark.exe ../../editcap.exe \ ../../wireshark.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe -DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll +DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/wsutil.dll DOC=../../doc/ws.css \ ../../doc/capinfos.html \ ../../doc/dumpcap.html \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index a301c6b258..246164c02a 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -287,7 +287,7 @@ File "${STAGING_DIR}\wiretap-${WTAP_VERSION}.dll" !ifdef ENABLE_LIBWIRESHARK File "${STAGING_DIR}\libwireshark.dll" !endif -File "${STAGING_DIR}\libwsutil.dll" +File "${STAGING_DIR}\wsutil.dll" File "${STAGING_DIR}\libgio-2.0-0.dll" File "${STAGING_DIR}\libglib-2.0-0.dll" File "${STAGING_DIR}\libgobject-2.0-0.dll" |