aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.global.in7
-rw-r--r--src/include/config.h.in13
2 files changed, 1 insertions, 19 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 5cb85b78571..e315e0cf1d1 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.8 1997/02/05 21:21:33 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.9 1997/02/06 06:33:47 scrappy Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@@ -80,11 +80,6 @@ LIBPQDIR:= $(SRCDIR)/libpq
# changable separately.
POSTGRESDIR= /usr/local/pgsql
-# DATADIR specifies where the postmaster expects to find its database.
-# This may be overridden by command line options or the PGDATA environment
-# variable.
-DATADIR= $(POSTGRESDIR)/data
-
# Where the postgres executables live (changeable by just putting them
# somewhere else and putting that directory in your shell PATH)
BINDIR= $(POSTGRESDIR)/bin
diff --git a/src/include/config.h.in b/src/include/config.h.in
index abd7b5fc597..8167e597759 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -194,7 +194,6 @@
# define USE_POSIX_TIME
# define USE_POSIX_SIGNALS
# define NO_EMPTY_STMTS
-# define USE_POSIX_TIME
# define SYSV_DIRENT
# define HAS_TEST_AND_SET
typedef unsigned char slock_t;
@@ -202,7 +201,6 @@ typedef unsigned char slock_t;
#if defined(sunos4)
# define USE_POSIX_TIME
-/* # undef HAVE_MEMMOVE */
#endif
#if defined(svr4)
@@ -260,11 +258,6 @@ typedef unsigned char slock_t;
#define DEF_PGPORT "5432"
-/* turn this on if you prefer European style dates instead of American
- * style dates
- */
-/* #define EUROPEAN_DATES */
-
/*
* If you do not plan to use Host based authentication,
* comment out the following line
@@ -395,10 +388,4 @@ typedef unsigned char slock_t;
/* Undocumented "features"? */
#define FASTBUILD /* access/nbtree/nbtsort.c */
-
-
-
-
-
#endif /* CONFIG_H */
-