about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2014-05-13 19:38:32 +0200
committerOndřej Bílka <neleai@seznam.cz>2014-05-13 19:38:32 +0200
commit893b4f375668c025cbd6828f82a8844edda276d1 (patch)
tree3ddd5b74cb61eb3bbe8729097ea5d5531df1feb7
parent58aa195d323d93f1d69a833d5a710396976f7620 (diff)
downloadglibc-893b4f375668c025cbd6828f82a8844edda276d1.tar.gz
glibc-893b4f375668c025cbd6828f82a8844edda276d1.tar.xz
glibc-893b4f375668c025cbd6828f82a8844edda276d1.zip
tzselect: use zonedir instead of current working directory
-rw-r--r--ChangeLog6
-rw-r--r--timezone/Makefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c250344a8..8906e0fa2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-13  Sami Kerola  <kerolasa@iki.fi>
+
+	* timezone/Makefile ($(objpfx)tzselect): Use zonedir instead
+	current working directory
+
+
 2014-05-13  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/unix/sysv/linux/arm/nptl/c++-types.data: Moved ...
diff --git a/timezone/Makefile b/timezone/Makefile
index 998cd14dff..d5f647ccf6 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
 
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
 	sed -e 's|/bin/bash|$(BASH)|' \
-	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
+	    -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \
 	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
 	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
 	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \