diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-02-27 15:57:08 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-27 16:08:11 +0100 |
| commit | 9094981751e776fa93537c91bc0e678f4d806b91 (patch) | |
| tree | f8fae32b51dbd08ef2343da8084d6dbab9d0f6f3 /postgresql-setup.in | |
| parent | 28c5dbbab21fb19606cb548582885458928eda30 (diff) | |
| download | postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.tar.gz postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.tar.xz postgresql-setup-9094981751e776fa93537c91bc0e678f4d806b91.zip | |
configury: another scl-izing commit
* Makefile.am: Move systemd directory definitions into
configure.ac. This is then easily configurable via config.site.
* configure.ac (PGENGINE, PG_CTL_BIN): Remove, bindir is
sufficient.
(PREVMAJORVERSION, PREVPGENGINE): Removed. It si configurable
now.
(INIDB_SCLS): Generalize into SCLS variable.
(SCLS): Moved from INIDB_SCLS.
(PGDATADIR): Default changed to have ${prefix} inside.
(SED_RULES): Remove unused variables (or to not be
used, TODO for next commit).
(conf_dir): New macro to define config.site
friendly directory variable.
(SCL_SHELL_WRAPPER): Convenient macro to generate appropriate call
to scl binary (only when building for software collections).
* postgresql-check-db-dir.in: Use new variable layout.
* postgresql-ctl.in: Likewise.
* postgresql-setup.in: Likewise.
* postgresql.service.in: Likewise. This fixes regression of not
using ${bindir} properly.
Diffstat (limited to 'postgresql-setup.in')
| -rw-r--r-- | postgresql-setup.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/postgresql-setup.in b/postgresql-setup.in index e1384cc..33021f5 100644 --- a/postgresql-setup.in +++ b/postgresql-setup.in @@ -7,7 +7,7 @@ test -z "$PATH" && export PATH="/sbin:/usr/sbin:/bin:/usr/bin" test x"$PGSETUP_DEBUG" != x && set -x && PS4='${LINENO}: ' # Directory containing the postmaster executable -PGENGINE=@PGENGINE@ +PGENGINE=@bindir@ # Distribution README file README_DIST=@README_DIST@ @@ -25,7 +25,7 @@ PGPORT_DEF=5432 option_upgradefrom="@NAME_DEFAULT_PREV_SERVICE@" # Space separated list of SCLS to be enabled during upgrade -initdb_scls="@INITDB_SCLS@" +initdb_scls="@SCLS@" USAGE_STRING=$"\ Usage: $0 MODE_OPTION [--unit=UNIT_NAME] [OPTION...] @@ -403,7 +403,7 @@ upgrade() generate_systemd_dropin() { local service="$1" - local dropindir="@userunitsdir@/$service.service.d" + local dropindir="@systemduserunitsdir@/$service.service.d" local dropin="$dropindir/30-@NAME_BINARYBASE@-setup.conf" test -e "$dropindir" \ |