aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-10 00:31:20 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-10 00:31:20 +0000
commit9ec6f8bd90e485c122af91f68ba3962380a9f6d4 (patch)
treecc3a2df6fd223e8aa87a9695a192b1b3897fd795
parent0aa8f8a17fdeebce1a87c0c2e664f47734505f61 (diff)
downloadglibc-9ec6f8bd90e485c122af91f68ba3962380a9f6d4.tar
glibc-9ec6f8bd90e485c122af91f68ba3962380a9f6d4.tar.gz
glibc-9ec6f8bd90e485c122af91f68ba3962380a9f6d4.tar.bz2
glibc-9ec6f8bd90e485c122af91f68ba3962380a9f6d4.zip
Use glibc version information in zic and zdump.
-rw-r--r--ChangeLog7
-rw-r--r--timezone/Makefile7
-rw-r--r--timezone/README4
-rw-r--r--timezone/version.h1
4 files changed, 15 insertions, 4 deletions
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";