aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-06-14 05:49:19 +0000
committerWerner Koch <[email protected]>2004-06-14 05:49:19 +0000
commit7e165d975892fa4d16c0e5d3d249eea7aee804d2 (patch)
tree43738c5fd0575d02c99365eeb343339f19e1aa45
parent* gpgkeys_http.c: General polish and removal of leftover stuff from (diff)
downloadgnupg-7e165d975892fa4d16c0e5d3d249eea7aee804d2.tar.gz
gnupg-7e165d975892fa4d16c0e5d3d249eea7aee804d2.zip
* mk-w32-dist: Do not include the en@* po files.
* autogen.sh <--build-w32>: Build keyserver helpers again.
Diffstat (limited to '')
-rw-r--r--scripts/ChangeLog6
-rwxr-xr-xscripts/autogen.sh2
-rwxr-xr-xscripts/mk-w32-dist5
3 files changed, 11 insertions, 2 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 7912e39d1..9cfcbcdf4 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-14 Werner Koch <[email protected]>
+
+ * mk-w32-dist: Do not include the en@* po files.
+
+ * autogen.sh <--build-w32>: Build keyserver helpers again.
+
2004-04-02 Thomas Schwinge <[email protected]>
* autogen.sh: Added ACLOCAL_FLAGS.
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 98462cd09..24ba3eae6 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -71,7 +71,7 @@ if test "$1" = "--build-w32"; then
[ $DIE = yes ] && exit 1
$tsdir/configure --build=${build} --host=${host} \
- ${disable_foo_tests} --disable-keyserver-helpers $*
+ ${disable_foo_tests} $*
# Ugly hack to overcome a gettext problem. Someone should look into
# gettext to figure out why the po directory is not ignored as it used
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 300ad7329..085193383 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -76,9 +76,12 @@ for i in ${srcdir}/po/*.po; do
tr) toset="CP1254" ;; # DOS: CP857
el) toset="CP1253" ;; # same as latin-7?
el|eo|et|ja|pl|hu|sk|zh_TW) toset="" ;;
+ en@*) toset="skip" ;;
*) toset="CP850" ;;
esac
- if [ -n "$toset" ]; then
+ if [ "$toset" = "skip" ]; then
+ :
+ elif [ -n "$toset" ]; then
echo "$lang: converting from $fromset to $toset" >&2
iconv --silent --from-code=$fromset --to-code=$toset < $i | \
sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=$toset/" | \