From 9ec6f8bd90e485c122af91f68ba3962380a9f6d4 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 10 Nov 2012 00:31:20 +0000
Subject: Use glibc version information in zic and zdump.

---
 ChangeLog          | 7 +++++++
 timezone/Makefile  | 7 +++++++
 timezone/README    | 4 +---
 timezone/version.h | 1 -
 4 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 timezone/version.h

diff --git a/ChangeLog b/ChangeLog
index d0a9145c0b..538c451919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-11-09  Joseph Myers  <joseph@codesourcery.com>
 
+	* timezone/version.h: Remove file.
+	* timezone/README: Do not refer to version.h.
+	* timezone/Makefile ($(objpfx)zic.o): New dependency on
+	$(objpfx)version.h.
+	($(objpfx)zdump.o): Likewise.
+	($(objpfx)/version.h): New target.
+
 	* timezone/tzselect.ksh: Change to verbatim copy from tzcode
 	2012i.
 	* timezone/README: Don't mention modification to tzselect.ksh.
diff --git a/timezone/Makefile b/timezone/Makefile
index 49d3b9d472..87b03e2c5f 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -54,6 +54,13 @@ include ../Rules
 
 $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
 
+$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
+
+$(objpfx)version.h: $(common-objpfx)config.make
+	echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \
+	    > $@.new
+	mv -f $@.new $@
+
 tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFAULT='"$(localtime-file)"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
diff --git a/timezone/README b/timezone/README
index da3f20dbd4..7a5e31ce42 100644
--- a/timezone/README
+++ b/timezone/README
@@ -1,9 +1,7 @@
 The files
 	zic.c zdump.c ialloc.c scheck.c tzfile.h
 	private.h tzselect.ksh checktab.awk
-come from the tzcode package by Arthur David Olson et.al.; the file
-	version.h
-has the contents that would be generated by that package's Makefile.
+come from the tzcode package by Arthur David Olson et.al.
 
 The files
 	africa antarctica asia australasia europe
diff --git a/timezone/version.h b/timezone/version.h
deleted file mode 100644
index 0873ea1347..0000000000
--- a/timezone/version.h
+++ /dev/null
@@ -1 +0,0 @@
-static char const TZVERSION[]="tz2012i";
-- 
cgit 1.4.1