[Commits] r21630 - in /fsf/trunk/libc: ChangeLog Makefile timezone/Makefile timezone/README timezone/tzselect.ksh

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Nov 10 00:01:57 2012
New Revision: 21630

Log:
Import glibc-mainline for 2012-11-10

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makefile
    fsf/trunk/libc/timezone/Makefile
    fsf/trunk/libc/timezone/README
    fsf/trunk/libc/timezone/tzselect.ksh

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Nov 10 00:01:57 2012
@@ -1,4 +1,15 @@
 2012-11-09  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* timezone/tzselect.ksh: Change to verbatim copy from tzcode
+	2012i.
+	* timezone/README: Don't mention modification to tzselect.ksh.
+	* timezone/Makefile ($(objpfx)tzselect): Update substitutions to
+	work on unmodified tzselect.ksh.  Substitute version numbers in
+	tzselect.ksh.
+
+	* Makefile (format-me): Remove.
+	(INSTALL): Adjust indentation.  Use commands directly instead of
+	using $(format-me).
 
 	* aclocal.m4 (ACX_PKGVERSION): New macro.
 	(ACX_BUGURL): Likewise.

Modified: fsf/trunk/libc/Makefile
==============================================================================
--- fsf/trunk/libc/Makefile (original)
+++ fsf/trunk/libc/Makefile Sat Nov 10 00:01:57 2012
@@ -397,15 +397,11 @@
 	fi
 endif
 
-define format-me
-@rm -f $@
-makeinfo --no-validate --plaintext --no-number-sections \
-	-I$(common-objpfx)manual $< -o $@
--chmod a-w $@
-endef
 INSTALL: manual/install.texi manual/macros.texi \
-	$(common-objpfx)manual/pkgvers.texi
-	$(format-me)
+	 $(common-objpfx)manual/pkgvers.texi
+	makeinfo --no-validate --plaintext --no-number-sections \
+		 -I$(common-objpfx)manual $< -o $@
+	-chmod a-w $@
 $(common-objpfx)manual/%: FORCE
 	$(MAKE) $(PARALLELMFLAGS) -C manual $@
 FORCE:

Modified: fsf/trunk/libc/timezone/Makefile
==============================================================================
--- fsf/trunk/libc/timezone/Makefile (original)
+++ fsf/trunk/libc/timezone/Makefile Sat Nov 10 00:01:57 2012
@@ -106,7 +106,9 @@
 
 
 $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
-	sed -e 's%@KSH@%$(KSH)%g' \
-	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
+	sed -e 's|/bin/bash|$(KSH)|g' \
+	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
+	    -e '/TZVERSION=/s|see_Makefile|"$(PKGVERSION)$(version)"|' \
+	    < $< > $@.new
 	chmod 555 $@.new
 	mv -f $@.new $@

Modified: fsf/trunk/libc/timezone/README
==============================================================================
--- fsf/trunk/libc/timezone/README (original)
+++ fsf/trunk/libc/timezone/README Sat Nov 10 00:01:57 2012
@@ -3,8 +3,7 @@
 	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,
-and tzselect.ksh has been modified for use in glibc.
+has the contents that would be generated by that package's Makefile.
 
 The files
 	africa antarctica asia australasia europe

Modified: fsf/trunk/libc/timezone/tzselect.ksh
==============================================================================
--- fsf/trunk/libc/timezone/tzselect.ksh (original)
+++ fsf/trunk/libc/timezone/tzselect.ksh Sat Nov 10 00:01:57 2012
@@ -1,6 +1,6 @@
-#! @KSH@
-
-TZVERSION=tz2012i
+#!/bin/bash
+
+TZVERSION=see_Makefile
 
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
@@ -29,7 +29,7 @@
 
 # Specify default values for environment variables if they are unset.
 : ${AWK=awk}
-: ${TZDIR=@TZDIR@}
+: ${TZDIR=$(pwd)}
 
 # Check for awk Posix compliance.
 ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits