summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2014-07-03 14:01:52 +0200
committerPavel Raiskup <praiskup@redhat.com>2014-07-03 14:04:03 +0200
commitae8bfd7109395216ebb802499084fe890038a78f (patch)
tree1d4c4110f6600d17c174f26ad15be573b4be945d /configure.ac
parentd83a864291c9f113d27bfb90d21fede7c35cdcf3 (diff)
downloadpostgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.tar.gz
postgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.tar.xz
postgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.zip
upgrade/initdb logs: diverge among service names
Generate separate log file for each service. Also, don't configure with INITDB_LOG or UPGRADE_LOG but rather with POSTGRES_HOME.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index f496066..df10f3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,16 +143,14 @@ redhat)
;;
esac
-test -z "$INITDB_LOG" &&
- INITDB_LOG=/var/lib/pgsql/initdb.log
-
-test -z "$UPGRADE_LOG" &&
- UPGRADE_LOG=/var/lib/pgsql/pgupgrade.log
-
if test -z "$PKGCONFIG_DIR" -a "$distro_family" = redhat; then
PKGCONFIG_DIR=/etc/postgresql
fi
+if test -z "$POSTGRES_HOMEDIR" -a "$distro_family" = redhat; then
+ POSTGRES_HOMEDIR=/var/lib/pgsql
+fi
+
if test -z "$PGDATADIR" -a "$distro_family" = redhat; then
PGDATADIR=/var/lib/pgsql/data
fi
@@ -168,9 +166,8 @@ subst_required_var([PGENGINE], [directory where PG server resides])
subst_required_var([PREVMAJORVERSION], [PG major version to upgrade _from_])
subst_required_var([PREVPGENGINE], [directory where old PG server resides])
subst_required_var([README_DIST], [README file for distribution])
-subst_required_var([INITDB_LOG], [log file for initdb])
-subst_required_var([UPGRADE_LOG], [log file for pg_upgrade])
subst_required_var([PKGCONFIG_DIR], [where configuration should be stored])
+subst_required_var([POSTGRES_HOMEDIR], [full path to postgres home dir])
subst_required_var([PGDATADIR], [full path to postgres data dir])
AC_OUTPUT