Use unmodified tzselect.ksh in glibc.

This commit is contained in:
Joseph Myers 2012-11-09 23:42:31 +00:00
parent 4e87147f34
commit 0aa8f8a17f
4 changed files with 15 additions and 7 deletions

View File

@ -1,5 +1,12 @@
2012-11-09 Joseph Myers <joseph@codesourcery.com>
* timezone/tzselect.ksh: Change to verbatim copy from tzcode
2012i.
* timezone/README: Don't mention modification to tzselect.ksh.
* timezone/Makefile ($(objpfx)tzselect): Update substitutions to
work on unmodified tzselect.ksh. Substitute version numbers in
tzselect.ksh.
* Makefile (format-me): Remove.
(INSTALL): Adjust indentation. Use commands directly instead of
using $(format-me).

View File

@ -106,7 +106,9 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
sed -e 's%@KSH@%$(KSH)%g' \
-e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
sed -e 's|/bin/bash|$(KSH)|g' \
-e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(PKGVERSION)$(version)"|' \
< $< > $@.new
chmod 555 $@.new
mv -f $@.new $@

View File

@ -3,8 +3,7 @@ The files
private.h tzselect.ksh checktab.awk
come from the tzcode package by Arthur David Olson et.al.; the file
version.h
has the contents that would be generated by that package's Makefile,
and tzselect.ksh has been modified for use in glibc.
has the contents that would be generated by that package's Makefile.
The files
africa antarctica asia australasia europe

View File

@ -1,6 +1,6 @@
#! @KSH@
#!/bin/bash
TZVERSION=tz2012i
TZVERSION=see_Makefile
# Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin.
@ -29,7 +29,7 @@ TZVERSION=tz2012i
# Specify default values for environment variables if they are unset.
: ${AWK=awk}
: ${TZDIR=@TZDIR@}
: ${TZDIR=$(pwd)}
# Check for awk Posix compliance.
($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1