Fix zic compiler to use pg version.
Move timezone database to share/timezone.
This commit is contained in:
parent
04d426ba70
commit
85b7e8351f
|
@ -4,7 +4,7 @@
|
||||||
# Makefile for the timezone library
|
# Makefile for the timezone library
|
||||||
|
|
||||||
# IDENTIFICATION
|
# 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 = ../..
|
top_builddir = ../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
|
override CPPFLAGS += -DPGDATADIR=\"$(datadir)\"
|
||||||
|
|
||||||
OBJS= asctime.o difftime.o localtime.o pgtz.o
|
OBJS= asctime.o difftime.o localtime.o pgtz.o
|
||||||
ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.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)
|
$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
|
||||||
|
|
||||||
install: zic
|
install: zic
|
||||||
./zic -d $(pkglibdir)/../timezone $(TZDATAFILES)
|
./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
|
||||||
|
|
||||||
clean distclean maintainer-clean:
|
clean distclean maintainer-clean:
|
||||||
rm -f SUBSYS.o $(OBJS) $(ZICOBJS)
|
rm -f SUBSYS.o $(OBJS) $(ZICOBJS)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* 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;
|
return tzdir;
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
StrNCpy(tzdir,PKGLIBDIR, MAXPGPATH);
|
StrNCpy(tzdir, PGDATADIR, MAXPGPATH);
|
||||||
#else
|
#else
|
||||||
if (GetModuleFileName(NULL,tzdir,MAXPGPATH) == 0)
|
if (GetModuleFileName(NULL,tzdir,MAXPGPATH) == 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -35,7 +35,7 @@ char *pgwin32_TZDIR(void) {
|
||||||
else
|
else
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
|
|
||||||
strcat(tzdir,"/../timezone");
|
strcat(tzdir,"/timezone");
|
||||||
|
|
||||||
done_tzdir=1;
|
done_tzdir=1;
|
||||||
return tzdir;
|
return tzdir;
|
||||||
|
|
Loading…
Reference in New Issue