From 85b7e8351f1647d1941eb4ddd1f89f9765d5f907 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 30 Apr 2004 20:23:28 +0000
Subject: [PATCH] Fix zic compiler to use pg version.

Move timezone database to share/timezone.
---
 src/timezone/Makefile | 6 +++---
 src/timezone/pgtz.c   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index d0e7490d65..ee3e15a120 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the timezone library
 
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.6 2004/04/30 20:01:39 momjian Exp $
+#    $PostgreSQL: pgsql/src/timezone/Makefile,v 1.7 2004/04/30 20:23:28 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/timezone
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+override CPPFLAGS += -DPGDATADIR=\"$(datadir)\"
 
 OBJS= asctime.o difftime.o localtime.o pgtz.o
 ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o
@@ -30,7 +30,7 @@ zic: $(ZICOBJS)
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
 
 install: zic
-	./zic -d $(pkglibdir)/../timezone $(TZDATAFILES)
+	./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
 
 clean distclean maintainer-clean:
 	rm -f SUBSYS.o $(OBJS) $(ZICOBJS)
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 8e94fc8c6c..efa9b4119e 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.2 2004/04/30 14:24:14 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.3 2004/04/30 20:23:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@ char *pgwin32_TZDIR(void) {
 		return tzdir;
 
 #ifndef WIN32
-	StrNCpy(tzdir,PKGLIBDIR, MAXPGPATH);
+	StrNCpy(tzdir, PGDATADIR, MAXPGPATH);
 #else
 	if (GetModuleFileName(NULL,tzdir,MAXPGPATH) == 0)
 		return NULL;
@@ -35,7 +35,7 @@ char *pgwin32_TZDIR(void) {
 	else
 		*p = '\0';
 	
-	strcat(tzdir,"/../timezone");
+	strcat(tzdir,"/timezone");
 
 	done_tzdir=1;
 	return tzdir;