git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile

index 7c0a5dc93f11098a92a9fea0c814f89af25e45d4..0ec0705da37db4bcc79c8093f705ca0547b22318 100644 (file)

--- a/src/bin/pg_controldata/Makefile

+++ b/src/bin/pg_controldata/Makefile

#

# Copyright (c) 1998-2002, PostgreSQL Global Development Group

#

-# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.6 2004年04月26日 17:40:48 momjian Exp $

+# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.7 2004年04月30日 20:01:39 momjian Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

+override CPPFLAGS += -DFRONTEND

+

OBJS= pg_controldata.o pg_crc.o

all: submake-libpgport pg_controldata

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile

index 516b3d7a764a3d7c19325088682bfd8a357e7711..59722363a5d9657b62163e15a19fbc074cb253aa 100644 (file)

--- a/src/bin/pg_dump/Makefile

+++ b/src/bin/pg_dump/Makefile

# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group

# Portions Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.45 2004年04月26日 17:40:48 momjian Exp $

+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.46 2004年04月30日 20:01:39 momjian Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

+override CPPFLAGS += -DFRONTEND

+

OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \

pg_backup_files.o pg_backup_null.o pg_backup_tar.o \

dumputils.o

diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile

index 1f36ed65c805979a319b23259921ad717fda80cc..e59217ba68eb501ec714ab946784b916bb321c21 100644 (file)

--- a/src/bin/pg_resetxlog/Makefile

+++ b/src/bin/pg_resetxlog/Makefile

#

# Copyright (c) 1998-2002, PostgreSQL Global Development Group

#

-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.7 2004年04月26日 17:40:48 momjian Exp $

+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.8 2004年04月30日 20:01:39 momjian Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-override CPPFLAGS := $(CPPFLAGS) -DFRONTEND

+override CPPFLAGS += -DFRONTEND

OBJS= pg_resetxlog.o pg_crc.o \

$(filter dirmod.o, $(LIBOBJS))

diff --git a/src/timezone/Makefile b/src/timezone/Makefile

index 22639a4e4a68e7d4d76171d30a2912f05588b38d..d0e7490d655b5a74e806ef93c5e6b1598f4e4bd7 100644 (file)

--- a/src/timezone/Makefile

+++ b/src/timezone/Makefile

# Makefile for the timezone library

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.5 2004年04月30日 17:52:07 momjian Exp $

+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.6 2004年04月30日 20:01:39 momjian Exp $

#

#-------------------------------------------------------------------------

$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)

install: zic

- zic -d $(pkglibdir)/../timezone $(TZDATAFILES)

+ ./zic -d $(pkglibdir)/../timezone $(TZDATAFILES)

clean distclean maintainer-clean:

rm -f SUBSYS.o $(OBJS) $(ZICOBJS)

diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h

index 6be10367c4653d4a545bb31d933dc4210e5ac754..09205a5ee47e889b339774dcdefe31983f5b441a 100644 (file)

--- a/src/timezone/pgtz.h

+++ b/src/timezone/pgtz.h

#define HAVE_SYMLINK 0

#endif

+

#define NOID

#define TZDIR pgwin32_TZDIR()

diff --git a/src/timezone/private.h b/src/timezone/private.h

index c8f45486837f754d14f5974033afbca4d3a4a82a..d71c58b6acbd120a4fc997a828e066629c37e283 100644 (file)

--- a/src/timezone/private.h

+++ b/src/timezone/private.h

#include "errno.h"

#include "string.h"

#include "limits.h" /* for CHAR_BIT */

+

+#define save_timezone pg_timezone

+#undef timezone

#include "time.h"

+#define timezone save_timezone

+

#include "stdlib.h"

#if HAVE_GETTEXT - 0