aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-01-27 14:26:11 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-01-27 14:26:11 +0000
commit2e5732b7ae1ff7af13130041d546ebf554884ebf (patch)
tree57f6aabdd715da5020352ae487784219993fa778
parent1144c36b11d75b9a983e21b18e366fb024a0583a (diff)
New gettext-runtime
svn path=/trunk/; revision=24206
-rw-r--r--Makefile.nmake3
-rwxr-xr-xtools/win32-setup.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index b5e9cd568c..5ea873181e 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -665,7 +665,7 @@ process_libs:
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
libiconv-1.9.1.bin.woe32 libiconv-1.9.1.bin.woe32.zip
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- gettext-runtime-0.17 gettext-runtime-0.17.zip
+ gettext-runtime-0.17-1 gettext-runtime-0.17-1.zip
!IFDEF KFW_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
kfw-2.5 kfw-2.5.zip
@@ -798,6 +798,7 @@ process_libs:
clean_setup:
rm -r -f $(WIRESHARK_LIBS)/adns-1.0-win32-05
rm -r -f $(WIRESHARK_LIBS)/gettext-0.14.5
+ rm -r -f $(WIRESHARK_LIBS)/gettext-0.17
rm -r -f $(WIRESHARK_LIBS)/glib
rm -r -f $(WIRESHARK_LIBS)/gnutls-1.6.1-1
rm -r -f $(WIRESHARK_LIBS)/gtk2
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 448aa23761..5ade0a6102 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,8 +7,8 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save privious tag.
-#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-25/packages/"
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-15/packages/"
+#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-15/packages/"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-27/packages/"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"