diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | timezone/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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 998cd14..d5f647c 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)"|' \ |