From 33481db83bb5f6f7d1017e17a00cd0012a06f117 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 2 Oct 2014 17:42:36 +0200 Subject: buildsystem: better handle distro-README Avoid detecting README.rpm-dist as we generate this file and we know the best where the file is. * configure.ac: Avoid detecting README path. Also substitute new variable README_DIST_BASENAME. * Makefile.am: Use the new $(README_DIST_BASENAME). * postgres-check-db-dir.in: Use README_DIST instead of PGDOCDIR. --- postgresql-check-db-dir.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'postgresql-check-db-dir.in') diff --git a/postgresql-check-db-dir.in b/postgresql-check-db-dir.in index e579edf..f8adc2d 100644 --- a/postgresql-check-db-dir.in +++ b/postgresql-check-db-dir.in @@ -45,8 +45,8 @@ PGMAJORVERSION=@PGMAJORVERSION@ # Previous major version, e.g., 8.4, for upgrades PREVMAJORVERSION=@PREVMAJORVERSION@ -# Directory containing the postgresql package's documentation -PGDOCDIR=@pgdocdir@ +# Distribution README file +README_DIST=@README_DIST@ # Check for the PGDATA structure if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] @@ -59,19 +59,19 @@ then then echo $"An old version of the database format was found." echo $"Use \"postgresql-setup --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 $"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 # No existing PGDATA! Warn the user to initdb it. echo $"\"$PGDATA\" is missing or empty." echo $"Use \"postgresql-setup --initdb\" to initialize the database cluster." - echo $"See $PGDOCDIR/README.rpm-dist for more information." + echo $"See $README_DIST for more information." exit 1 fi -- cgit