From e27d476a652874ad8556fcdb06d877ebabb3e9c7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 13 Nov 2012 22:25:45 +0000
Subject: Update tzcode from upstream git and support --with-bugurl for it.

---
 timezone/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'timezone/Makefile')

diff --git a/timezone/Makefile b/timezone/Makefile
index 87b03e2c5f..a1da8fa56c 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -57,7 +57,7 @@ $(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)";' \
+	echo 'static char const TZVERSION[]="$(version)";' \
 	    > $@.new
 	mv -f $@.new $@
 
@@ -115,7 +115,9 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
 	sed -e 's|/bin/bash|$(KSH)|g' \
 	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-	    -e '/TZVERSION=/s|see_Makefile|"$(PKGVERSION)$(version)"|' \
+	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
 	    < $< > $@.new
 	chmod 555 $@.new
 	mv -f $@.new $@
-- 
cgit 1.4.1