From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 1 May 2004 22:07:03 +0000 (+0000)
Subject: Fix timezone data path for Unix and win32.
X-Git-Tag: REL8_0_0BETA1~713
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4c69c820550a352cb123bfb0b16c33c659a4ca6;p=thirdparty%2Fpostgresql.git

Fix timezone data path for Unix and win32.
---

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;
 }