summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2004-05-01 22:07:03 +0000
committerBruce Momjian <bruce@momjian.us>2004-05-01 22:07:03 +0000
commitf4c69c820550a352cb123bfb0b16c33c659a4ca6 (patch)
tree754b949a3fa1fd357e5d50168374f46e8349ab6f /src
parentd7ee665089cde1cd44c2f65121969bea6428dd54 (diff)
Fix timezone data path for Unix and win32.
Diffstat (limited to 'src')
-rw-r--r--src/timezone/pgtz.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 2dc894cccd6..ec2a9428e02 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.5 2004/05/01 01:38:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.6 2004/05/01 22:07:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,15 +33,17 @@ pg_TZDIR(void)
#endif
canonicalize_path(tzdir);
-#if 0
+#ifdef WIN32
+ /* trim off binary name, then go up a directory */
if ((p = last_path_separator(tzdir)) == NULL)
return NULL;
else
*p = '\0';
+ strcat(tzdir, "/../share/timezone");
#endif
-
strcat(tzdir, "/timezone");
+
done_tzdir = 1;
return tzdir;
}