Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 04d426b

Browse files
committed
Allow build of timezone database on unix.
1 parent 1360fe4 commit 04d426b

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

src/bin/pg_controldata/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.6 2004/04/26 17:40:48 momjian Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.7 2004/04/30 20:01:39 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/bin/pg_controldata
1212
top_builddir = ../../..
1313
include $(top_builddir)/src/Makefile.global
1414

15+
override CPPFLAGS += -DFRONTEND
16+
1517
OBJS= pg_controldata.o pg_crc.o
1618

1719
all: submake-libpgport pg_controldata

src/bin/pg_dump/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.45 2004/04/26 17:40:48 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.46 2004/04/30 20:01:39 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

1212
subdir = src/bin/pg_dump
1313
top_builddir = ../../..
1414
include $(top_builddir)/src/Makefile.global
1515

16+
override CPPFLAGS += -DFRONTEND
17+
1618
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
1719
pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
1820
dumputils.o

src/bin/pg_resetxlog/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.7 2004/04/26 17:40:48 momjian Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.8 2004/04/30 20:01:39 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/bin/pg_resetxlog
1212
top_builddir = ../../..
1313
include $(top_builddir)/src/Makefile.global
1414

15-
override CPPFLAGS := $(CPPFLAGS) -DFRONTEND
15+
override CPPFLAGS += -DFRONTEND
1616

1717
OBJS= pg_resetxlog.o pg_crc.o \
1818
$(filter dirmod.o, $(LIBOBJS))

src/timezone/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the timezone library
55

66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.5 2004/04/30 17:52:07 momjian Exp $
7+
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.6 2004/04/30 20:01:39 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -30,7 +30,7 @@ zic: $(ZICOBJS)
3030
$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
3131

3232
install: zic
33-
zic -d $(pkglibdir)/../timezone $(TZDATAFILES)
33+
./zic -d $(pkglibdir)/../timezone $(TZDATAFILES)
3434

3535
clean distclean maintainer-clean:
3636
rm -f SUBSYS.o $(OBJS) $(ZICOBJS)

src/timezone/pgtz.h

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#define HAVE_SYMLINK 0
55
#endif
66

7+
78
#define NOID
89
#define TZDIR pgwin32_TZDIR()
910

src/timezone/private.h

+5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ static char privatehid[] = "@(#)private.h 7.53";
8888
#include "errno.h"
8989
#include "string.h"
9090
#include "limits.h" /* for CHAR_BIT */
91+
92+
#define save_timezone pg_timezone
93+
#undef timezone
9194
#include "time.h"
95+
#define timezone save_timezone
96+
9297
#include "stdlib.h"
9398

9499
#if HAVE_GETTEXT - 0

0 commit comments

Comments
 (0)