diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 23:42:31 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 23:42:31 +0000 |
| commit | 0aa8f8a17fdeebce1a87c0c2e664f47734505f61 (patch) | |
| tree | 3bed28a3f626220b46682f83d263a1807fd04b87 | |
| parent | 4e87147f3445cc6d6b568e6f8b0b4b8f833b314e (diff) | |
| download | glibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.tar.gz glibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.tar.xz glibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.zip | |
Use unmodified tzselect.ksh in glibc.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | timezone/Makefile | 6 | ||||
| -rw-r--r-- | timezone/README | 3 | ||||
| -rw-r--r-- | timezone/tzselect.ksh | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 1914a03bcf..d0a9145c0b 100644 --- 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 9e55a6ac54..49d3b9d472 100644 --- 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 cb3d2cdb69..da3f20dbd4 100644 --- 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 0e93d7982b..4fe5d02ba1 100644 --- 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 |