From e3b63da8ecf14ecbf575c2ca76351b5b0e8dc3c6 Mon Sep 17 00:00:00 2001 From: jbettis Date: Wed, 12 Apr 2006 19:41:44 +0000 Subject: [PATCH] Use native time zone files under Solaris. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22780 72102866-910b-0410-8b05-ffd578937521 --- Source/NSTimeZone.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m index 9c8b85832..9383f035d 100644 --- a/Source/NSTimeZone.m +++ b/Source/NSTimeZone.m @@ -147,7 +147,12 @@ /* Many systems have this file */ #define SYSTEM_TIME_FILE @"/etc/localtime" +/* If TZDIR told us where the zoneinfo files are, don't append anything else */ +#ifdef TZDIR +#define POSIX_TZONES @"" +#else #define POSIX_TZONES @"posix/" +#endif /* Possible location of system time zone files */ static NSString *tzdir = nil; @@ -2004,6 +2009,9 @@ static NSMapTable *absolutes = 0; * Common locations for timezone info on unix systems. */ static NSString *zoneDirs[] = { +#ifdef TZDIR + @ TZDIR, +#endif @"/usr/share/zoneinfo", @"/usr/lib/zoneinfo", @"/usr/local/share/zoneinfo",