about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-05-16 13:43:47 +1000
committerAllan McRae <allan@archlinux.org>2014-05-16 13:58:31 +1000
commitc72399fbc5228580a560d8fe319ff98150928b05 (patch)
treea67ff51d077cef3b828dde2120090094571a268d
parentd16e6ec7ca2c861ba681e3a2fbd431725774292e (diff)
downloadglibc-c72399fbc5228580a560d8fe319ff98150928b05.tar.gz
glibc-c72399fbc5228580a560d8fe319ff98150928b05.tar.xz
glibc-c72399fbc5228580a560d8fe319ff98150928b05.zip
Fix variable used in sed expression in timezone/Makefile
-rw-r--r--ChangeLog5
-rw-r--r--timezone/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 09a7f7db9c..4161750632 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 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)"|' \