diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-02-10 10:59:40 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-10 12:17:00 +0100 |
| commit | f4661e4b9d362b84d101c98a4334c229555e2a54 (patch) | |
| tree | ebebdffd78224a62130b940f9ad3395d86abd785 | |
| parent | 84219fefff0b9d00c94c72cf0cd903611b1cf05f (diff) | |
| download | postgresql-setup-f4661e4b9d362b84d101c98a4334c229555e2a54.tar.gz postgresql-setup-f4661e4b9d362b84d101c98a4334c229555e2a54.tar.xz postgresql-setup-f4661e4b9d362b84d101c98a4334c229555e2a54.zip | |
postgresql.init: use $README_DIST also
Issue detected by './configure --with-sysvinit && make check'.
* postgresql.init.in ($PGDOCDIR): Wipe it out.
($README_DIST): Use on appropriate places.
* Makefile.am: Add TODO relevant to this commit.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | postgresql.init.in | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e40a0cc..a967c38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ libexec_SCRIPTS = postgresql$(DISTSUFF)-ctl \ userunitsdir = /etc/systemd/system +# TODO: Ideally, 'make distcheck' should check every file we generate. if WANT_SYSVINIT initscriptsdir = $(sysconfdir)/rc.d/init.d initscripts_DATA = postgresql$(DISTSUFF) diff --git a/postgresql.init.in b/postgresql.init.in index b183486..f75f4e5 100644 --- a/postgresql.init.in +++ b/postgresql.init.in @@ -31,7 +31,9 @@ PREVMAJORVERSION=@PREVMAJORVERSION@ PREVPGENGINE=@PREVPGENGINE@ # PGDOCDIR is the directory containing the package's documentation # Note: the specfile inserts the correct value during package build -PGDOCDIR=@PGDOCDIR@ + +# Distribution README file +README_DIST=@README_DIST@ # Source function library. . /etc/rc.d/init.d/functions @@ -93,13 +95,13 @@ start(){ echo echo $"An old version of the database format was found." echo $"Use \"service postgresql upgrade\" to upgrade to version $PGMAJORVERSION." - echo $"See $PGDOCDIR/README.rpm-dist for more information." + echo $"See $README_DIST for more information." exit 1 else echo echo $"An old version of the database format was found." echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION." - echo $"See $PGDOCDIR/README.rpm-dist for more information." + echo $"See $README_DIST for more information." exit 1 fi else |