diff mbox

tzselect: use zonedir instead of current working directory

Message ID 53758DFC.90001@archlinux.org
State Committed
Headers

Commit Message

Allan McRae May 16, 2014, 4:03 a.m. UTC 
  On 14/05/14 03:40, Ondřej Bílka wrote:
> On Sun, May 11, 2014 at 11:27:39AM +0100, Sami Kerola wrote:
>> Hi Ondrej,
>>
>> Here's the version with ChangeLog update.
>>
> thanks, i commited it
> 

Well...  this patch was broken.  Committed the following fix as obvious:
diff mbox

Patch

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)"|' \