summaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-10-20 18:50:58 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-10-20 18:50:58 +0000
commit0f80fa5c7d747a026d4fd30220a98d087cef53b1 (patch)
tree32d5522fd1cd1a87e2803b0df458fe6fb77d99ba /image
parent39de90e5da056fd473dfd0b47f4e4d06ea4aa8d3 (diff)
downloadwireshark-0f80fa5c7d747a026d4fd30220a98d087cef53b1.tar.gz
renamed capinfo to capinfos, as the former name capinfo was already used in a program called tcprelay, so that might confuse packaging managers and users. Hopefully I got all the places need to be changed.
svn path=/trunk/; revision=12358
Diffstat (limited to 'image')
-rw-r--r--image/Makefile.nmake6
-rwxr-xr-ximage/capinfos.rc.in (renamed from image/capinfo.rc.in)8
2 files changed, 7 insertions, 7 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index db4b2b49aa..9c76df1a0d 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -4,7 +4,7 @@
include ..\config.nmake
-ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfo.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc
+ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc
all : $(ALL_RC)
ethereal.rc : ethereal.rc.in ..\config.nmake
@@ -22,10 +22,10 @@ tethereal.rc : tethereal.rc.in ..\config.nmake
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< tethereal.rc.in > $@
-capinfo.rc : capinfo.rc.in ..\config.nmake
+capinfos.rc : capinfos.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
- < capinfo.rc.in > $@
+ < capinfos.rc.in > $@
editcap.rc : editcap.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
diff --git a/image/capinfo.rc.in b/image/capinfos.rc.in
index 36cc6fa2e2..e82463d6c6 100755
--- a/image/capinfo.rc.in
+++ b/image/capinfos.rc.in
@@ -20,12 +20,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The Ethereal developer community\0"
- VALUE "FileDescription", "Capinfo\0"
+ VALUE "FileDescription", "Capinfos\0"
VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "Capinfo @VERSION@\0"
+ VALUE "InternalName", "Capinfos @VERSION@\0"
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
- VALUE "OriginalFilename", "Capinfo.exe\0"
- VALUE "ProductName", "Capinfo\0"
+ VALUE "OriginalFilename", "Capinfos.exe\0"
+ VALUE "ProductName", "Capinfos\0"
VALUE "ProductVersion", "@VERSION@\0"
END
END