diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-03-02 09:41:33 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-03-02 10:10:53 +0100 |
| commit | 7b1dbe74c98f5be41ad5605260f0edbf40a9fcd1 (patch) | |
| tree | 12ce1599858a23ee9a0d9088543450b9e4617f62 /configure.ac | |
| parent | 9094981751e776fa93537c91bc0e678f4d806b91 (diff) | |
| download | postgresql-setup-7b1dbe74c98f5be41ad5605260f0edbf40a9fcd1.tar.gz postgresql-setup-7b1dbe74c98f5be41ad5605260f0edbf40a9fcd1.tar.xz postgresql-setup-7b1dbe74c98f5be41ad5605260f0edbf40a9fcd1.zip | |
postgresql-check-db-dir: match configuration approach
* configure.ac (PGDATADIR): Use /var/lib/pgsql/data when prefix is
set to /usr.
(rawpkgdatadir): New directory. Its different from pkgdatadir,
because thats often set to /usr/share/postgresql.
* Makefile.am: Include new rawpkgdatadir Makefile.inc. Fix
distcheck by mentioning legacyscripts_SCRIPTS in GENERATED_FILES.
* postgresql-check-db-dir.in: Use library.sh to give user better
advice. Use @NAME_BINARYBASE@ prefix.
(bad_version): New function.
(PREVMAJORVERSION): Removed unused variable.
* postgresql-setup.in: Cut out the config-parsing routines into
library.sh.
* share/postgresql-setup/library.sh.in: New library file. Added
new option 'list' for parse_upgrade_setup.
* share/postgresql-setup/Makefile.inc: New file.
* share/postgresql-setup/.gitignore: Ignore library.sh.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 022c22a..e25b6a8 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,7 @@ conf_dir([systemdunitsdir], ['${prefix}/lib/systemd/system']) conf_dir([systemduserunitsdir], ['${prefix}/etc/systemd/system']) conf_dir([systemdlegacyscriptsdir], ['${libexecdir}/initscripts/legacy-actions']) conf_dir([initscriptsdir], ['${sysconfdir}/rc.d/init.d']) +conf_dir([rawpkgdatadir], ['${datadir}/postgresql-setup']) INSTANTIATE_CONV="\$(AM_V_GEN)rm -rf \$@; \$(MKDIR_P) \$(@D)" INSTANTIATE="\$(INSTANTIATE_CONV) && \$(SED_CALL) \$< > \$@ && chmod -w \$@" @@ -133,7 +134,12 @@ if test -z "$POSTGRES_HOMEDIR" -a "$pgsetup_cv_os_family" = redhat; then fi if test -z "$PGDATADIR" -a "$pgsetup_cv_os_family" = redhat; then - PGDATADIR="\${prefix}/var/lib/pgsql/data" + if test x"$prefix" = x/usr + then + PGDATADIR=/var/lib/pgsql/data + else + PGDATADIR="\${prefix}/var/lib/pgsql/data" + fi fi pgdocdir="\${datarootdir}/doc/\${pkgname}" |