about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makeconfig8
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 41d18e680c..a6f53c1076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makeconfig (localtime): Remove variable.
+	(inst_localtime-file): Likewise.
+
 2012-05-01  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/ld.abilist:
diff --git a/Makeconfig b/Makeconfig
index 148db6e3df..5c78ee497b 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -291,13 +291,6 @@ vardbdir = /var/db
 endif
 inst_vardbdir = $(install_root)$(vardbdir)
 
-# What timezone should be the installed default (e.g., US/Eastern).
-# Run `make -C time echo-zonenames' to see a list of available zone names.
-# The local timezone can be changed with `zic -l TIMEZONE' at any time.
-ifndef localtime
-localtime = Factory
-endif
-
 # Where to install the "localtime" timezone file; this is the file whose
 # contents $(localtime) specifies.  If this is a relative pathname, it is
 # relative to $(zonedir).  It is a good idea to put this somewhere
@@ -305,7 +298,6 @@ endif
 # localizing the configuration data elsewhere.
 ifndef localtime-file
 localtime-file = $(sysconfdir)/localtime
-inst_localtime-file = $(install_root)$(localtime-file)
 endif
 
 # What to use for leap second specifications in compiling the default