aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/init
diff options
context:
space:
mode:
authorBryan Henderson <bryanh@giraffe.netgate.net>1996-11-14 10:25:54 +0000
committerBryan Henderson <bryanh@giraffe.netgate.net>1996-11-14 10:25:54 +0000
commitf64b8403871fbb8a5cd475f58dd432a53549a60d (patch)
tree038ebc1218e286105fdba624a7a53cd7d26518a2 /src/backend/utils/init
parent7ac541daf1b0bba6274f280eedba01166f97cbe8 (diff)
downloadpostgresql-f64b8403871fbb8a5cd475f58dd432a53549a60d.tar.gz
postgresql-f64b8403871fbb8a5cd475f58dd432a53549a60d.zip
Remove most compile-time options, add a few runtime options to make up for it.
In particular, no more compiled-in default for PGDATA or LIBDIR. Commands that need them need either invocation options or environment variables. PGPORT default is hardcoded as 5432, but overrideable with options or environment variables.
Diffstat (limited to 'src/backend/utils/init')
-rw-r--r--src/backend/utils/init/Makefile5
-rw-r--r--src/backend/utils/init/globals.c11
-rw-r--r--src/backend/utils/init/miscinit.c34
3 files changed, 3 insertions, 47 deletions
diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
index ccbc145d7b1..b3b4ef8c76d 100644
--- a/src/backend/utils/init/Makefile
+++ b/src/backend/utils/init/Makefile
@@ -4,7 +4,7 @@
# Makefile for utils/init
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.3 1996/11/12 06:46:40 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.4 1996/11/14 10:24:32 bryanh Exp $
#
#-------------------------------------------------------------------------
@@ -16,9 +16,6 @@ INCLUDE_OPT = -I../.. \
-I../../../include
CFLAGS += $(INCLUDE_OPT)
-# The following defines really ought to go in config.h
-CFLAGS += -DPOSTGRESDIR='"$(POSTGRESDIR)"' -DPGDATADIR='"$(DATADIR)"' \
- -DPOSTPORT='"$(POSTPORT)"'
OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index aafec5dc3ae..2326ca1cf91 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.2 1996/11/06 10:31:54 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.3 1996/11/14 10:24:38 bryanh Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -99,12 +99,3 @@ char *SharedSystemRelationNames[] = {
VariableRelationName,
0
};
-
-/* set up global variables, pointers, etc. */
-void InitGlobals()
-{
- MasterPid = getpid();
- DataDir = GetPGData();
-}
-
-
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index aaaaf00ab91..a9639d7a74e 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.2 1996/11/06 10:31:57 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.3 1996/11/14 10:24:41 bryanh Exp $
*
*-------------------------------------------------------------------------
*/
@@ -345,35 +345,3 @@ SetUserId()
UserRelationName);
UserId = (Oid) ((Form_pg_user) GETSTRUCT(userTup))->usesysid;
}
-
-/* ----------------
- * GetPGHome
- *
- * Get POSTGRESHOME from environment, or return default.
- * ----------------
- */
-char *
-GetPGHome()
-{
-#ifdef USE_ENVIRONMENT
- char *h;
-
- if ((h = getenv("POSTGRESHOME")) != (char *) NULL)
- return (h);
-#endif /* USE_ENVIRONMENT */
- return (POSTGRESDIR);
-
-}
-
-char *
-GetPGData()
-{
-#ifdef USE_ENVIRONMENT
- char *p;
-
- if ((p = getenv("PGDATA")) != (char *) NULL) {
- return (p);
- }
-#endif /* USE_ENVIRONMENT */
- return (PGDATADIR);
-}