Allow build of timezone database on unix.

bmomjian · bmomjian · commit 04d426ba7065 · 2004-04-30T20:01:39.000Z
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
@@ -4,14 +4,16 @@
 #
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 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
@@ -5,14 +5,16 @@
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 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
@@ -4,15 +4,15 @@
 #
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 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
@@ -4,7 +4,7 @@
 #    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 $
 #
 #-------------------------------------------------------------------------
 
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,16 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2002, PostgreSQL Global Development Group`
`6`	`6`	`#`
`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 $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/bin/pg_controldata`
`12`	`12`	`top_builddir = ../../..`
`13`	`13`	`include $(top_builddir)/src/Makefile.global`
`14`	`14`
	`15`	`+override CPPFLAGS += -DFRONTEND`
	`16`	`+`
`15`	`17`	`OBJS= pg_controldata.o pg_crc.o`
`16`	`18`
`17`	`19`	`all: submake-libpgport pg_controldata`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1998-2002, PostgreSQL Global Development Group`
`6`	`6`	`#`
`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 $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/bin/pg_resetxlog`
`12`	`12`	`top_builddir = ../../..`
`13`	`13`	`include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-override CPPFLAGS := $(CPPFLAGS) -DFRONTEND`
	`15`	`+override CPPFLAGS += -DFRONTEND`
`16`	`16`
`17`	`17`	`OBJS= pg_resetxlog.o pg_crc.o \`
`18`	`18`	`$(filter dirmod.o, $(LIBOBJS))`