From f4c69c820550a352cb123bfb0b16c33c659a4ca6 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 1 May 2004 22:07:03 +0000 Subject: [PATCH] Fix timezone data path for Unix and win32. --- src/timezone/pgtz.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 2dc894cccd..ec2a9428e0 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; }