Commit85b7e83

committed

Fix zic compiler to use pg version.

Move timezone database to share/timezone.

1 parent04d426b commit85b7e83Copy full SHA for 85b7e83

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`# Makefile for the timezone library`
`5`	`5`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.6 2004/04/30 20:01:39 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.7 2004/04/30 20:23:28 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/timezone`
`12`	`12`	`top_builddir = ../..`
`13`	`13`	`include$(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-overrideCPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"`
	`15`	`+overrideCPPFLAGS += -DPGDATADIR=\"$(datadir)\"`
`16`	`16`
`17`	`17`	`OBJS= asctime.o difftime.o localtime.o pgtz.o`
`18`	`18`	`ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o`
`@@ -30,7 +30,7 @@ zic: $(ZICOBJS)`
`30`	`30`	`$(CC)$(CFLAGS)$(ZICOBJS)$(LDFLAGS)$(LIBS) -o$@$(X)`
`31`	`31`
`32`	`32`	`install: zic`
`33`		`-./zic -d$(pkglibdir)/../timezone$(TZDATAFILES)`
	`33`	`+./zic -d$(DESTDIR)$(datadir)/timezone$(TZDATAFILES)`
`34`	`34`
`35`	`35`	`cleandistcleanmaintainer-clean:`
`36`	`36`	`rm -f SUBSYS.o$(OBJS)$(ZICOBJS)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.2 2004/04/3014:24:14 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.3 2004/04/3020:23:28 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -23,7 +23,7 @@ char *pgwin32_TZDIR(void) {`
`23`	`23`	`returntzdir;`
`24`	`24`
`25`	`25`	`#ifndefWIN32`
`26`		`-StrNCpy(tzdir,PKGLIBDIR,MAXPGPATH);`
	`26`	`+StrNCpy(tzdir,PGDATADIR,MAXPGPATH);`
`27`	`27`	`#else`
`28`	`28`	`if (GetModuleFileName(NULL,tzdir,MAXPGPATH)==0)`
`29`	`29`	`returnNULL;`
`@@ -35,7 +35,7 @@ char *pgwin32_TZDIR(void) {`
`35`	`35`	`else`
`36`	`36`	`*p='\0';`
`37`	`37`
`38`		`-strcat(tzdir,"/../timezone");`
	`38`	`+strcat(tzdir,"/timezone");`
`39`	`39`
`40`	`40`	`done_tzdir=1;`
`41`	`41`	`returntzdir;`

Comments

(0)