105 lines
3.3 KiB
Diff
105 lines
3.3 KiB
Diff
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
|
|
index 0e3bed5..aee6064 100644
|
|
--- a/src/Makefile.global.in
|
|
+++ b/src/Makefile.global.in
|
|
@@ -74,14 +74,14 @@ bindir := @bindir@
|
|
datadir := @datadir@
|
|
ifeq "$(findstring pgsql, $(datadir))" ""
|
|
ifeq "$(findstring postgres, $(datadir))" ""
|
|
-override datadir := $(datadir)/postgresql
|
|
+override datadir := $(datadir)/sepgsql
|
|
endif
|
|
endif
|
|
|
|
sysconfdir := @sysconfdir@
|
|
ifeq "$(findstring pgsql, $(sysconfdir))" ""
|
|
ifeq "$(findstring postgres, $(sysconfdir))" ""
|
|
-override sysconfdir := $(sysconfdir)/postgresql
|
|
+override sysconfdir := $(sysconfdir)/sepgsql
|
|
endif
|
|
endif
|
|
|
|
@@ -90,7 +90,7 @@ libdir := @libdir@
|
|
pkglibdir = $(libdir)
|
|
ifeq "$(findstring pgsql, $(pkglibdir))" ""
|
|
ifeq "$(findstring postgres, $(pkglibdir))" ""
|
|
-override pkglibdir := $(pkglibdir)/postgresql
|
|
+override pkglibdir := $(pkglibdir)/sepgsql
|
|
endif
|
|
endif
|
|
|
|
@@ -99,7 +99,7 @@ includedir := @includedir@
|
|
pkgincludedir = $(includedir)
|
|
ifeq "$(findstring pgsql, $(pkgincludedir))" ""
|
|
ifeq "$(findstring postgres, $(pkgincludedir))" ""
|
|
-override pkgincludedir := $(pkgincludedir)/postgresql
|
|
+override pkgincludedir := $(pkgincludedir)/sepgsql
|
|
endif
|
|
endif
|
|
|
|
@@ -108,7 +108,7 @@ mandir := @mandir@
|
|
docdir := @docdir@
|
|
ifeq "$(findstring pgsql, $(docdir))" ""
|
|
ifeq "$(findstring postgres, $(docdir))" ""
|
|
-override docdir := $(docdir)/postgresql
|
|
+override docdir := $(docdir)/sepgsql
|
|
endif
|
|
endif
|
|
|
|
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
|
|
index 497bdf0..54908f8 100644
|
|
--- a/src/bin/initdb/initdb.c
|
|
+++ b/src/bin/initdb/initdb.c
|
|
@@ -2722,7 +2722,7 @@ main(int argc, char *argv[])
|
|
*/
|
|
putenv("TZ=GMT");
|
|
|
|
- if ((ret = find_other_exec(argv[0], "postgres", PG_BACKEND_VERSIONSTR,
|
|
+ if ((ret = find_other_exec(argv[0], "sepostgres", PG_BACKEND_VERSIONSTR,
|
|
backend_exec)) < 0)
|
|
{
|
|
char full_path[MAXPGPATH];
|
|
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
|
|
index 814ce97..2550e57 100644
|
|
--- a/src/bin/pg_ctl/pg_ctl.c
|
|
+++ b/src/bin/pg_ctl/pg_ctl.c
|
|
@@ -654,7 +654,7 @@ do_init(void)
|
|
char cmd[MAXPGPATH];
|
|
|
|
if (exec_path == NULL)
|
|
- exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");
|
|
+ exec_path = find_other_exec_or_die(argv0, "initdb.sepgsql", "initdb (PostgreSQL) " PG_VERSION "\n");
|
|
|
|
if (pgdata_opt == NULL)
|
|
pgdata_opt = "";
|
|
@@ -699,7 +699,7 @@ do_start(void)
|
|
pgdata_opt = "";
|
|
|
|
if (exec_path == NULL)
|
|
- exec_path = find_other_exec_or_die(argv0, "postgres", PG_BACKEND_VERSIONSTR);
|
|
+ exec_path = find_other_exec_or_die(argv0, "sepostgres", PG_BACKEND_VERSIONSTR);
|
|
|
|
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_CORE)
|
|
if (allow_core_files)
|
|
@@ -1069,7 +1069,7 @@ pgwin32_CommandLine(bool registration)
|
|
}
|
|
else
|
|
{
|
|
- ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR,
|
|
+ ret = find_other_exec(argv0, "sepostgres", PG_BACKEND_VERSIONSTR,
|
|
cmdLine);
|
|
if (ret != 0)
|
|
{
|
|
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
|
|
index 83f1678..a0a9444 100644
|
|
--- a/src/bin/pg_dump/pg_dumpall.c
|
|
+++ b/src/bin/pg_dump/pg_dumpall.c
|
|
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
|
|
}
|
|
}
|
|
|
|
- if ((ret = find_other_exec(argv[0], "pg_dump", PGDUMP_VERSIONSTR,
|
|
+ if ((ret = find_other_exec(argv[0], "sepg_dump", PGDUMP_VERSIONSTR,
|
|
pg_dump_bin)) < 0)
|
|
{
|
|
char full_path[MAXPGPATH];
|