Skip to content
Snippets Groups Projects
Commit 04d426ba authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Allow build of timezone database on unix.

parent 1360fe40
Branches
Tags
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1998-2002, PostgreSQL Global Development Group # 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 $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,6 +12,8 @@ subdir = src/bin/pg_controldata ...@@ -12,6 +12,8 @@ subdir = src/bin/pg_controldata
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -DFRONTEND
OBJS= pg_controldata.o pg_crc.o OBJS= pg_controldata.o pg_crc.o
all: submake-libpgport pg_controldata all: submake-libpgport pg_controldata
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # 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 $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -13,6 +13,8 @@ subdir = src/bin/pg_dump ...@@ -13,6 +13,8 @@ subdir = src/bin/pg_dump
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -DFRONTEND
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ 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 \ pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
dumputils.o dumputils.o
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1998-2002, PostgreSQL Global Development Group # 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 $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -12,7 +12,7 @@ subdir = src/bin/pg_resetxlog ...@@ -12,7 +12,7 @@ subdir = src/bin/pg_resetxlog
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS := $(CPPFLAGS) -DFRONTEND override CPPFLAGS += -DFRONTEND
OBJS= pg_resetxlog.o pg_crc.o \ OBJS= pg_resetxlog.o pg_crc.o \
$(filter dirmod.o, $(LIBOBJS)) $(filter dirmod.o, $(LIBOBJS))
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for the timezone library # Makefile for the timezone library
# IDENTIFICATION # 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 $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -30,7 +30,7 @@ zic: $(ZICOBJS) ...@@ -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 $(pkglibdir)/../timezone $(TZDATAFILES)
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f SUBSYS.o $(OBJS) $(ZICOBJS) rm -f SUBSYS.o $(OBJS) $(ZICOBJS)
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define HAVE_SYMLINK 0 #define HAVE_SYMLINK 0
#endif #endif
#define NOID #define NOID
#define TZDIR pgwin32_TZDIR() #define TZDIR pgwin32_TZDIR()
......
...@@ -88,7 +88,12 @@ static char privatehid[] = "@(#)private.h 7.53"; ...@@ -88,7 +88,12 @@ static char privatehid[] = "@(#)private.h 7.53";
#include "errno.h" #include "errno.h"
#include "string.h" #include "string.h"
#include "limits.h" /* for CHAR_BIT */ #include "limits.h" /* for CHAR_BIT */
#define save_timezone pg_timezone
#undef timezone
#include "time.h" #include "time.h"
#define timezone save_timezone
#include "stdlib.h" #include "stdlib.h"
#if HAVE_GETTEXT - 0 #if HAVE_GETTEXT - 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment