From 1f2d5b7d006bb5a85538750328dee160058cdbca Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 13 May 2014 19:38:32 +0200 Subject: tzselect: use zonedir instead of current working directory (cherry picked from commit 893b4f375668c025cbd6828f82a8844edda276d1) (cherry picked from commit c72399fbc5228580a560d8fe319ff98150928b05) Conflicts: timezone/Makefile --- ChangeLog | 5 +++++ timezone/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 42e9558e43..21b76eee91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-13 Sami Kerola + + * timezone/Makefile ($(objpfx)tzselect): Use zonedir instead + current working directory + 2014-05-16 Allan McRae * po/sv.po: Update Swedish translation from translation project. diff --git a/timezone/Makefile b/timezone/Makefile index f5fb4241e0..58e7f507b1 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -114,7 +114,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps) $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make sed -e 's|/bin/bash|$(KSH)|g' \ - -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ + -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -- cgit v1.2.3