diff options
| author | Bruce Momjian | 2004-04-30 20:01:39 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-04-30 20:01:39 +0000 |
| commit | 74ce8ac4c90da34241daeb92aadb1b71d23d9c8d (patch) | |
| tree | 0a5b19973c79af1165227cd4d87a18140890e5bf | |
| parent | 20a5e64a12d80e7793cfa068b6818fb871eb0535 (diff) | |
Allow build of timezone database on unix.
| -rw-r--r-- | src/bin/pg_controldata/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/Makefile | 2 | ||||
| -rw-r--r-- | src/bin/pg_resetxlog/Makefile | 2 | ||||
| -rw-r--r-- | src/timezone/Makefile | 2 | ||||
| -rw-r--r-- | src/timezone/pgtz.h | 1 | ||||
| -rw-r--r-- | src/timezone/private.h | 5 |
6 files changed, 12 insertions, 2 deletions
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index bc070f0b6a..565d321a37 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -12,6 +12,8 @@ subdir = src/bin/pg_controldata 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 90a7c059cf..3a8e75037c 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -13,6 +13,8 @@ subdir = src/bin/pg_dump 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 ec06764abc..878467ff34 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetxlog/Makefile @@ -12,7 +12,7 @@ subdir = src/bin/pg_resetxlog 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 ce42c1bcf1..05722ac822 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -30,7 +30,7 @@ zic: $(ZICOBJS) $(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 6be10367c4..09205a5ee4 100644 --- a/src/timezone/pgtz.h +++ b/src/timezone/pgtz.h @@ -4,6 +4,7 @@ #define HAVE_SYMLINK 0 #endif + #define NOID #define TZDIR pgwin32_TZDIR() diff --git a/src/timezone/private.h b/src/timezone/private.h index c8f4548683..d71c58b6ac 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -88,7 +88,12 @@ static char privatehid[] = "@(#)private.h 7.53"; #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 |