Fix timezone data path for Unix and win32.
authorBruce Momjian <bruce@momjian.us>
Sat, 1 May 2004 22:07:03 +0000 (22:07 +0000)
committerBruce Momjian <bruce@momjian.us>
Sat, 1 May 2004 22:07:03 +0000 (22:07 +0000)
src/timezone/pgtz.c

index 2dc894cccd66ea68c452bbaa119a48debcb2acdc..ec2a9428e0208d0f06d63cb352ff0cf33bb19c1e 100644 (file)
@@ -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;
 }