about summary refs log tree commit diff
path: root/timezone/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-09 23:42:31 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-09 23:42:31 +0000
commit0aa8f8a17fdeebce1a87c0c2e664f47734505f61 (patch)
tree3bed28a3f626220b46682f83d263a1807fd04b87 /timezone/Makefile
parent4e87147f3445cc6d6b568e6f8b0b4b8f833b314e (diff)
downloadglibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.tar.gz
glibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.tar.xz
glibc-0aa8f8a17fdeebce1a87c0c2e664f47734505f61.zip
Use unmodified tzselect.ksh in glibc.
Diffstat (limited to 'timezone/Makefile')
-rw-r--r--timezone/Makefile6
1 files changed, 4 insertions, 2 deletions
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 $@