summary refs log tree commit diff
path: root/timezone/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-13 22:25:45 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-13 22:25:45 +0000
commite27d476a652874ad8556fcdb06d877ebabb3e9c7 (patch)
tree076cd90c6e6d6dcf584493c8e332e3abe309665e /timezone/Makefile
parent8ca8931812236803335e0aa13d4c3158bf6c67de (diff)
downloadglibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.tar.gz
glibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.tar.xz
glibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.zip
Update tzcode from upstream git and support --with-bugurl for it.
Diffstat (limited to 'timezone/Makefile')
-rw-r--r--timezone/Makefile6
1 files changed, 4 insertions, 2 deletions
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 $@