diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-07-01 12:05:55 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-07-01 12:05:55 +0200 |
| commit | 4a30b44a89dc107912cd2613137bceca63895047 (patch) | |
| tree | 6d79fcdca6c1d0b58da8461733798bdf82402e30 | |
| parent | 8c49d3b08882c0c5a6bd546fd5bf0a14e68b3357 (diff) | |
| download | postgresql-setup-4a30b44a89dc107912cd2613137bceca63895047.tar.gz postgresql-setup-4a30b44a89dc107912cd2613137bceca63895047.tar.xz postgresql-setup-4a30b44a89dc107912cd2613137bceca63895047.zip | |
generate also README.rpm-dist
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | README.rpm-dist.in (renamed from README.rpm-dist) | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b4c3a37..43ab15a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,8 @@ pkgsysconf_DATA = conf/postgresql$(DISTSUFF) systemdunitsdir = $(prefix)/lib/systemd/system systemdunits_DATA = postgresql$(DISTSUFF).service +nodist_pgdoc_DATA = README.rpm-dist + config_status = $(top_srcdir)/config.status postgresql$(DISTSUFF)-ctl: postgresql-ctl.in @@ -28,4 +30,11 @@ postgresql$(DISTSUFF).service: postgresql.service.in $(AM_V_GEN)cmd="$(config_status) --file=$@:$<" ; \ if $(AM_V_P); then $$cmd; else $$cmd &>/dev/null; fi -CLEANFILES = $(bin_SCRIPTS) $(libexec_SCRIPTS) +README.rpm-dist: README.rpm-dist.in + $(AM_V_GEN)cmd="$(config_status) --file=$@:$<" ; \ + if $(AM_V_P); then $$cmd; else $$cmd &>/dev/null; fi + +CLEANFILES = $(bin_SCRIPTS) \ + $(libexec_SCRIPTS) \ + $(nodist_pgdoc_DATA) \ + $(nodist_systemdunits_DATA) diff --git a/README.rpm-dist b/README.rpm-dist.in index b582354..0fb080c 100644 --- a/README.rpm-dist +++ b/README.rpm-dist.in @@ -1,6 +1,6 @@ README.rpm-dist ----------------------------------------------------------------------------- -Version 9.3, for the PostgreSQL 9.3 RPM set. +Version @PGMAJORVERSION@, for the PostgreSQL @PGMAJORVERSION@ RPM set. Devrim Gündüz <devrim@gunduz.org> ----------------------------------------------------------------------------- @@ -83,7 +83,7 @@ and run the dump file through psql to restore your data. In some major releases, the RPMs also support in-place upgrade from the immediately previous major release. Currently, you can upgrade in-place -from 9.2.x to 9.3.x. This is much faster than a dump and reload. +from @PREVMAJORVERSION@.x to @PGMAJORVERSION@.x. This is much faster than a dump and reload. To do an in-place upgrade: * shut down the old postmaster ("systemctl stop postgresql.service") * optionally make a backup of /var/lib/pgsql/data/ (recommended!) diff --git a/configure.ac b/configure.ac index 6acd497..285b01f 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,10 @@ if test -z "$PGDATADIR" -a "$distro_family" = redhat; then PGDATADIR=/var/lib/pgsql/data fi +# TODO +pgdocdir=/usr/share/postgresql/doc +AC_SUBST([pgdocdir]) + # Deal with previous versions subst_required_var([PGVERSION], [full PG version]) subst_required_var([PGMAJORVERSION], [major PG version]) |