tzselect: use zonedir instead of current working directory

diff --git a/ChangeLog b/ChangeLog
index 5c250344a8535c05a2c5389e30a23e5ee60fbe93..8906e0fa2e32c407634e9d376ddfeffc5bc7cafb 100644 (file)
--- 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 998cd14dffb47c014d6702bcc5d221a7ff7ccde5..d5f647ccf606aa39513fa36d237e0c8cc287b097 100644 (file)
--- 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)"|' \