Use unmodified tzselect.ksh in glibc.

diff --git a/ChangeLog b/ChangeLog
index 1914a03..d0a9145 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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).

diff --git a/timezone/Makefile b/timezone/Makefile
index 9e55a6a..49d3b9d 100644 (file)
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -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 $@

diff --git a/timezone/README b/timezone/README
index cb3d2cd..da3f20d 100644 (file)
--- a/timezone/README
+++ b/timezone/README
@@ -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

diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
index 0e93d79..4fe5d02 100644 (file)
--- a/timezone/tzselect.ksh
+++ b/timezone/tzselect.ksh
@@ -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