Reorganize code to allow path-relative installs.

Create new get_* functions to access compiled-in paths and adjust if
relative installs are to be used.

Clean up substitute_libpath_macro() code.

Author: bmomjian

src/backend/postmaster/postmaster.c

@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.387 2004/05/14 17:04:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.388 2004/05/17 14:35:29 momjian Exp $
  *
  * NOTES
  *
@@ -697,6 +697,8 @@ PostmasterMain(int argc, char *argv[])
 		ereport(FATAL,
 				(errmsg("%s: could not locate my own executable path",
 						progname)));
+	if (strlen(pkglib_path) == 0)
+		get_pkglib_path(my_exec_path, pkglib_path);
 
 #ifdef EXEC_BACKEND
 	if (find_other_exec(argv[0], "postgres", PG_VERSIONSTR, postgres_exec_path) < 0)

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.406 2004/05/14 17:04:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.407 2004/05/17 14:35:31 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2652,6 +2652,9 @@ PostgresMain(int argc, char *argv[], const char *username)
 			ereport(FATAL,
 					(errmsg("%s: could not locate postgres executable",
 							argv[0])));
+		if (strlen(pkglib_path) == 0)
+			get_pkglib_path(my_exec_path, pkglib_path);
+			
 		/*
 		 * Validate we have been given a reasonable-looking DataDir (if
 		 * under postmaster, assume postmaster did this already).

src/backend/utils/fmgr/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.15 2003/12/23 21:56:20 tgl Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.16 2004/05/17 14:35:31 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = dfmgr.o fmgr.o funcapi.o
 
-override CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" -DDLSUFFIX=\"$(DLSUFFIX)\"
+override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\"
 
 
 all: SUBSYS.o

src/backend/utils/fmgr/dfmgr.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.71 2004/03/09 05:06:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.72 2004/05/17 14:35:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -270,12 +270,6 @@ file_exists(const char *name)
 #error "DLSUFFIX must be defined to compile this file."
 #endif
 
-/* Example format: "/usr/local/pgsql/lib" */
-#ifndef PKGLIBDIR
-#error "PKGLIBDIR needs to be defined to compile this file."
-#endif
-
-
 /*
  * If name contains a slash, check if the file exists, if so return
  * the name.  Else (no slash) try to expand using search path (see
@@ -341,62 +335,29 @@ expand_dynamic_library_name(const char *name)
 static char *
 substitute_libpath_macro(const char *name)
 {
-	size_t		macroname_len;
-	char	   *replacement = NULL;
-#ifdef WIN32
-	char		basename[MAXPGPATH];
-#endif
-
+	const char *sep_ptr;
+	char	   *ret;
+	
 	AssertArg(name != NULL);
 
 	if (name[0] != '$')
 		return pstrdup(name);
 
-#ifndef WIN32
-	macroname_len = strcspn(name + 1, "/") + 1;
-#else
-	macroname_len = strcspn(name + 1, "/\\") + 1;
-#endif
-
-	if (strncmp(name, "$libdir", macroname_len) == 0)
-#ifndef WIN32
-		replacement = PKGLIBDIR;
-#else
-	{
-		char *p;
-		if (GetModuleFileName(NULL,basename,MAXPGPATH) == 0)
-			ereport(FATAL,
-					(errmsg("GetModuleFileName failed (%i)",(int)GetLastError())));
-
-		canonicalize_path(basename);
-		if ((p = last_path_separator(basename)) == NULL)
-			ereport(FATAL,
-					(errmsg("unexpected failure in determining PKGLIBDIR (%s)",basename)));
-		else
-			*p = '\0';
-
-		strcat(basename,"/../lib");
-		replacement = basename;
-	}
-#endif
-	else
+	if ((sep_ptr = first_path_separator(name)) == NULL)
+		sep_ptr = name + strlen(name);
+		
+	if (strlen("$libdir") != sep_ptr - name ||
+		strncmp(name, "$libdir", strlen("$libdir")) != 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_NAME),
 				 errmsg("invalid macro name in dynamic library path")));
 
-	if (name[macroname_len] == '\0')
-		return pstrdup(replacement);
-	else
-	{
-		char	   *new;
+	ret = palloc(strlen(pkglib_path) + strlen(sep_ptr) + 1);
 
-		new = palloc(strlen(replacement) + (strlen(name) - macroname_len) + 1);
+	strcpy(ret, pkglib_path);
+	strcat(ret, sep_ptr);
 
-		strcpy(new, replacement);
-		strcat(new, name + macroname_len);
-
-		return new;
-	}
+	return ret;
 }
 
 

src/backend/utils/init/globals.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.85 2004/05/13 22:45:03 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.86 2004/05/17 14:35:32 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -46,6 +46,7 @@ char	   *DataDir = NULL;
 char		OutputFileName[MAXPGPATH];
 
 char		my_exec_path[MAXPGPATH];	/* full path to postgres executable */
+char		pkglib_path[MAXPGPATH];	/* full path to lib directory */
 
 BackendId	MyBackendId;
 

src/bin/initdb/Makefile

@@ -5,15 +5,15 @@
 # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.37 2004/05/11 21:57:14 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.38 2004/05/17 14:35:33 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/initdb
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -DPGDATADIR=\"$(datadir)\" -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS=	initdb.o \
 	$(filter exec.o, $(LIBOBJS))

src/bin/initdb/initdb.c

@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.30 2004/05/17 13:17:29 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.31 2004/05/17 14:35:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,11 +69,8 @@ int			optreset;
 
 /*
  * these values are passed in by makefile defines
- *
- * Note that "datadir" is not the directory we're going to initialize,
- * it's merely how Autoconf names PREFIX/share.
  */
-char	   *datadir = PGDATADIR;
+char		*share_path = NULL;
 
 /* values to be obtained from arguments */
 char	   *pg_data = "";
@@ -129,7 +126,7 @@ static const char *backend_options = "-F -O -c search_path=pg_catalog -c exit_on
 
 
 /* path to 'initdb' binary directory */
-char	   bindir[MAXPGPATH];
+char	   bin_path[MAXPGPATH];
 char	   backend_exec[MAXPGPATH];
 
 static void *xmalloc(size_t size);
@@ -730,8 +727,8 @@ mkdatadir(char *subdir)
 static void
 set_input(char **dest, char *filename)
 {
-	*dest = xmalloc(strlen(datadir) + strlen(filename) + 2);
-	sprintf(*dest, "%s/%s", datadir, filename);
+	*dest = xmalloc(strlen(share_path) + strlen(filename) + 2);
+	sprintf(*dest, "%s/%s", share_path, filename);
 }
 
 /*
@@ -1849,7 +1846,7 @@ main(int argc, char *argv[])
 				printf(_("Running in noclean mode.  Mistakes will not be cleaned up.\n"));
 				break;
 			case 'L':
-				datadir = xstrdup(optarg);
+				share_path = xstrdup(optarg);
 				break;
 			case 1:
 				locale = xstrdup(optarg);
@@ -1951,9 +1948,15 @@ main(int argc, char *argv[])
 	}
 
 	/* store binary directory */
-	strcpy(bindir, backend_exec);
-	*last_path_separator(bindir) = '\0';
-	
+	strcpy(bin_path, backend_exec);
+	*last_path_separator(bin_path) = '\0';
+
+	if (!share_path)
+	{
+		share_path = xmalloc(MAXPGPATH);
+		get_share_path(backend_exec, share_path);
+	}
+
 	if ((short_version = get_short_version()) == NULL)
 	{
 		fprintf(stderr, _("%s: could not determine valid short version string\n"), progname);
@@ -1983,13 +1986,13 @@ main(int argc, char *argv[])
 	{
 		fprintf(stderr,
 				"VERSION=%s\n"
-				"PGDATA=%s\ndatadir=%s\nPGPATH=%s\n"
+				"PGDATA=%s\nshare_path=%s\nPGPATH=%s\n"
 				"ENCODING=%s\nENCODINGID=%s\n"
 				"POSTGRES_SUPERUSERNAME=%s\nPOSTGRES_BKI=%s\n"
 				"POSTGRES_DESCR=%s\nPOSTGRESQL_CONF_SAMPLE=%s\n"
 				"PG_HBA_SAMPLE=%s\nPG_IDENT_SAMPLE=%s\n",
 				PG_VERSION,
-				pg_data, datadir, bindir,
+				pg_data, share_path, bin_path,
 				encoding, encodingid,
 				username, bki_file,
 				desc_file, conf_file,
@@ -2182,8 +2185,8 @@ main(int argc, char *argv[])
 		   "    %s%s%s/postmaster -D %s%s%s\n"
 		   "or\n"
 		   "    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n\n"),
-		 QUOTE_PATH, bindir, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH,
-		QUOTE_PATH, bindir, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH);
+		 QUOTE_PATH, bin_path, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH,
+		QUOTE_PATH, bin_path, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH);
 
 	return 0;
 }

src/bin/psql/Makefile

@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.43 2004/04/26 17:40:48 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.44 2004/05/17 14:35:33 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,11 +15,12 @@ include $(top_builddir)/src/Makefile.global
 
 REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
 
 OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
 	startup.o prompt.o variables.o large_obj.o print.o describe.o \
-	psqlscan.o tab-complete.o mbprint.o
+	psqlscan.o tab-complete.o mbprint.o \
+	$(filter exec.o, $(LIBOBJS))
 
 FLEXFLAGS = -Cfe
 
@@ -29,6 +30,9 @@ all: submake-libpq submake-libpgport psql
 psql: $(OBJS) $(libpq_builddir)/libpq.a
 	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
+exec.c: % : $(top_srcdir)/src/port/%
+	rm -f $@ && $(LN_S) $< .
+
 help.o: $(srcdir)/sql_help.h
 
 ifdef PERL
@@ -60,7 +64,7 @@ uninstall:
 
 # psqlscan.c is in the distribution tarball, so is not cleaned here
 clean distclean:
-	rm -f psql$(X) $(OBJS)
+	rm -f psql$(X) $(OBJS) exec.c
 
 maintainer-clean: distclean
 	rm -f $(srcdir)/sql_help.h $(srcdir)/psqlscan.c

src/bin/psql/startup.c

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.92 2004/05/02 04:25:45 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.93 2004/05/17 14:35:33 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -74,7 +74,7 @@ struct adhoc_opts
 
 static void parse_psql_options(int argc, char *argv[],
 				   struct adhoc_opts * options);
-static void process_psqlrc(void);
+static void process_psqlrc(char *argv0);
 static void process_psqlrc_file(char *filename);
 static void showVersion(void);
 
@@ -239,7 +239,7 @@ main(int argc, char *argv[])
 	if (options.action == ACT_FILE && strcmp(options.action_string, "-") != 0)
 	{
 		if (!options.no_psqlrc)
-			process_psqlrc();
+			process_psqlrc(argv[0]);
 
 		successResult = process_file(options.action_string);
 	}
@@ -305,7 +305,7 @@ main(int argc, char *argv[])
 		SetVariable(pset.vars, "PROMPT3", DEFAULT_PROMPT3);
 
 		if (!options.no_psqlrc)
-			process_psqlrc();
+			process_psqlrc(argv[0]);
 		if (!pset.notty)
 			initializeInput(options.no_readline ? 0 : 1);
 		if (options.action_string)		/* -f - was used */
@@ -567,22 +567,24 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 
 }
 
-#ifndef SYSCONFDIR
-#error "You must compile this file with SYSCONFDIR defined."
-#endif
-
 
 /*
  * Load .psqlrc file, if found.
  */
 static void
-process_psqlrc(void)
+process_psqlrc(char *argv0)
 {
-	char	   *globalFile = SYSCONFDIR "/" SYSPSQLRC;
 	char	   *home;
 	char	   *psqlrc;
+	char	   global_file[MAXPGPATH];
+	char	   my_exec_path[MAXPGPATH];
+	char	   etc_path[MAXPGPATH];
+
+	find_my_exec(argv0, my_exec_path);
+	get_etc_path(my_exec_path, etc_path);
 
-	process_psqlrc_file(globalFile);
+	snprintf(global_file, MAXPGPATH, "%s/%s", etc_path, SYSPSQLRC);
+	process_psqlrc_file(global_file);
 
 	if ((home = getenv("HOME")) != NULL)
 	{