diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-21 20:56:50 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-21 20:56:50 +0000 |
| commit | 13f96c4b6bc59f25ce430ad987cd0881284b6e76 (patch) | |
| tree | ac3c6779e95afe538db77c552942e1f7c6651231 /src/port/path.c | |
| parent | 748a15a8ea98fc80fc7cebf523246910109c1eae (diff) | |
| download | postgresql-13f96c4b6bc59f25ce430ad987cd0881284b6e76.tar.gz | |
Put path configuration information into a .h file instead of cluttering
several different module Makefiles with it. Also, do any adjustment
of installation paths during configure, rather than every time Makefile.global
is read.
Diffstat (limited to 'src/port/path.c')
| -rw-r--r-- | src/port/path.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/port/path.c b/src/port/path.c index a8f53bd895..616be999b1 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -8,14 +8,18 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/path.c,v 1.10 2004/05/19 04:21:49 momjian Exp $ + * $PostgreSQL: pgsql/src/port/path.c,v 1.11 2004/05/21 20:56:50 tgl Exp $ * *------------------------------------------------------------------------- */ #include "c.h" + #include <ctype.h> +#include "pg_config_paths.h" + + #ifndef WIN32 #define ISSEP(ch) ((ch) == '/') #else @@ -109,16 +113,15 @@ get_progname(const char *argv0) void get_share_path(const char *my_exec_path, char *ret_path) { - if (relative_path(PGBINDIR, PGDATADIR)) + if (relative_path(PGBINDIR, PGSHAREDIR)) { - /* Autoconf calls our /share 'datadir' */ StrNCpy(ret_path, my_exec_path, MAXPGPATH); trim_directory(ret_path); /* trim off binary */ trim_directory(ret_path); /* trim off /bin */ strcat(ret_path, "/share"); /* add /share */ } else - StrNCpy(ret_path, PGDATADIR, MAXPGPATH); + StrNCpy(ret_path, PGSHAREDIR, MAXPGPATH); } |