From c72399fbc5228580a560d8fe319ff98150928b05 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 16 May 2014 13:43:47 +1000 Subject: [PATCH] Fix variable used in sed expression in timezone/Makefile --- ChangeLog | 5 +++++ timezone/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09a7f7db9c..4161750632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-16 Allan McRae + + * timezone/Makefile ($(objpfx)tzselect): Use correct variable + in sed expression. + 2014-05-16 Aurelien Jarno [BZ #16917] diff --git a/timezone/Makefile b/timezone/Makefile index d5f647ccf6..0aef202536 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 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ + -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -- 2.11.4.GIT