From 0aa8f8a17fdeebce1a87c0c2e664f47734505f61 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 9 Nov 2012 23:42:31 +0000
Subject: Use unmodified tzselect.ksh in glibc.

---
 timezone/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'timezone/Makefile')

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 $@
-- 
cgit 1.4.1