From: Allan McRae <allan@archlinux.org>
Date: Fri, 16 May 2014 03:43:47 +0000 (+1000)
Subject: Fix variable used in sed expression in timezone/Makefile
X-Git-Tag: glibc-2.20~487
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c72399fbc5228580a560d8fe319ff98150928b05;p=platform%2Fupstream%2Fglibc.git

Fix variable used in sed expression in timezone/Makefile
---

diff --git a/ChangeLog b/ChangeLog
index 09a7f7d..4161750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16  Allan McRae  <allan@archlinux.org>
+
+	* timezone/Makefile ($(objpfx)tzselect): Use correct variable
+	in sed expression.
+
 2014-05-16  Aurelien Jarno  <aurelien@aurel32.net>
 
 	[BZ #16917]
diff --git a/timezone/Makefile b/timezone/Makefile
index d5f647c..0aef202 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)"|' \