This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-424-gc72399f

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c72399fbc5228580a560d8fe319ff98150928b05 (commit)
      from  d16e6ec7ca2c861ba681e3a2fbd431725774292e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------;a=commitdiff;h=c72399fbc5228580a560d8fe319ff98150928b05

commit c72399fbc5228580a560d8fe319ff98150928b05
Author: Allan McRae <>
Date:   Fri May 16 13:43:47 2014 +1000

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


Summary of changes:
 ChangeLog         |    5 +++++
 timezone/Makefile |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]