From f7f516372e2218daf18a79241d1fd271faa237cc Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 26 Feb 2015 14:03:22 +0100
Subject: configuration: define upgrade-config directory

Currently under /etc/postgresql-setup/upgrade.  All '*.conf' files
are going to be loaded run-time by postgresql-setup.

* postgresql-setup.in (read_config_file): New helper to safely
read configuration files.
(set_var): Remove comment.
(parse_upgrade_setup): Use new read_config_file().
(parse_configuration): Rename to service_configuration().
* Makefile.am: Don't include share/Makefile.inc.  Indent fixes.
Add install-data-hook helper to install config directory.
* build-helpers/Makefile.inc: Removed.
* build-helpers/build-config: Likewise.
* upgrade_config.template: Removed.
* etc/postgresql-setup/upgrade/postgresql.conf: New template.
* configure.ac: Remove --with-upgrade-config.  Package maintainers
are supposed to provide those for now.
* share/postgresql-setup/Makefile.inc: Removed.
---
 build-helpers/Makefile.inc |  7 -------
 build-helpers/build-config | 11 -----------
 2 files changed, 18 deletions(-)
 delete mode 100644 build-helpers/Makefile.inc
 delete mode 100755 build-helpers/build-config

(limited to 'build-helpers')

diff --git a/build-helpers/Makefile.inc b/build-helpers/Makefile.inc
deleted file mode 100644
index d54d239..0000000
--- a/build-helpers/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-config_builder =  $(top_srcdir)/%D%/build-config
-
-noinst_SCRIPT = $(config_builder)
-
-EXTRA_DIST += $(noinst_SCRIPT)
-
-# vim: ft=automake noet
diff --git a/build-helpers/build-config b/build-helpers/build-config
deleted file mode 100755
index 27841f2..0000000
--- a/build-helpers/build-config
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-# For easier parsing in postgresql-setup, we want to have each upgrade scenario
-# configured on separate line.
-
-eval set -- "$1"
-while test -n "$1"
-do
-    echo $(cat "$1" | grep -v ^# )
-    shift
-done
-- 
cgit