From 9cea22e1d0501f749e6d2a3140892f74f05dc2df Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 22 Apr 2015 15:05:47 +0200
Subject: README.rpm-dist: fix paths descriptions

* configure.ac: Substitute more variables.
* README.rpm-dist.template (Filesystem layout): Fix paths to be
generated correctly even for non-default builds.
(UPGRADING AN INSTALLATION): Fix link to old data directory.
---
 README.rpm-dist.template | 18 +++++++++---------
 configure.ac             |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.rpm-dist.template b/README.rpm-dist.template
index 673c125..b76b6bf 100644
--- a/README.rpm-dist.template
+++ b/README.rpm-dist.template
@@ -158,7 +158,7 @@ m4_divert[]m4_dnl
         <para>
           update the configuration files @PGDATADIR@/*.conf with any
           customizations you had before (your old configuration files are in
-          old data directory or in @POSTGRES_HOMEDIR@/data-old/ if you've done
+          old data directory or in @PGDATADIR@-old/ if you've done
           in-place upgrade)
         </para>
       </listitem>
@@ -287,16 +287,16 @@ m4_divert[]m4_dnl
       <tbody>
         <row><entry>Executables</entry><entry>@bindir@</entry></row>
         <row><entry>Libraries</entry><entry>@libdir@</entry></row>
-        <row><entry>Documentation</entry><entry>/usr/share/doc/postgresql/html</entry></row>
-        <row><entry>PDF documentation</entry><entry>/usr/share/doc/postgresql-docs</entry></row>
-        <row><entry>Contrib documentation</entry><entry>/usr/share/doc/postgresql-contrib</entry></row>
+        <row><entry>Documentation</entry><entry>@pgdocdir@/html</entry></row>
+        <row><entry>PDF documentation</entry><entry>@pgdocdir@</entry></row>
+        <row><entry>Contrib documentation</entry><entry>@pgcontribdocdir@</entry></row>
         <row><entry>Source</entry><entry>not installed</entry></row>
-        <row><entry>Data</entry><entry>/var/lib/pgsql/data</entry></row>
-        <row><entry>Backup area</entry><entry>/var/lib/pgsql/backups</entry></row>
-        <row><entry>Templates</entry><entry>/usr/share/pgsql</entry></row>
+        <row><entry>Data</entry><entry>@PGDATADIR@</entry></row>
+        <row><entry>Backup area</entry><entry>@sharedstatedir@/pgsql/backups</entry></row>
+        <row><entry>Templates</entry><entry>@datadir@/pgsql</entry></row>
         <row><entry>Procedural Languages</entry><entry>@libdir@/pgsql</entry></row>
-        <row><entry>Development Headers</entry><entry>/usr/include/pgsql</entry></row>
-        <row><entry>Other shared data</entry><entry>/usr/share/pgsql</entry></row>
+        <row><entry>Development Headers</entry><entry>@includedir@/pgsql</entry></row>
+        <row><entry>Other shared data</entry><entry>@datadir@/pgsql</entry></row>
         <row><entry>Regression tests</entry><entry>@libdir@/pgsql/test/regress  (in the -test package)</entry></row>
       </tbody>
     </tgroup>
diff --git a/configure.ac b/configure.ac
index 95368e5..133065a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,9 @@ AC_SUBST([WANT_SYSVINIT])
 m4_define([sed_subst_var_pattern], [	-e 's|@$1[[@]]|\$($1)|g' \\])
 SED_RULES="\\
 sed_subst_var_pattern(bindir)
+sed_subst_var_pattern(datadir)
 sed_subst_var_pattern(docdir)
+sed_subst_var_pattern(includedir)
 sed_subst_var_pattern(libdir)
 sed_subst_var_pattern(libexecdir)
 sed_subst_var_pattern(top_srcdir)
@@ -56,6 +58,7 @@ sed_subst_var_pattern(PGVERSION)
 sed_subst_var_pattern(PKGCONFIG_DIR)
 sed_subst_var_pattern(POSTGRES_HOMEDIR)
 sed_subst_var_pattern(README_DIST)
+sed_subst_var_pattern(sharedstatedir)
 sed_subst_var_pattern(SU_POSTGRES)
 sed_subst_var_pattern(sysconfdir)
 sed_subst_var_pattern(TEST_GEN_FILES_LIST)
@@ -82,6 +85,7 @@ conf_dir([systemdlegacyscriptsdir],  ['${libexecdir}/initscripts/legacy-actions'
 conf_dir([initscriptsdir],           ['${sysconfdir}/rc.d/init.d'])
 conf_dir([initscriptsconfdir],       ['/etc/sysconfig/pgsql'])
 conf_dir([rawpkgdatadir],            ['${datadir}/postgresql-setup'])
+# Those two should be specified explicitly.
 conf_dir([pgdocdir],                 ['${datarootdir}/doc/${NAME_PACKAGE}'])
 conf_dir([pgcontribdocdir],          ['${datarootdir}/doc/${NAME_PACKAGE}-contrib'])
 
-- 
cgit