From f7f516372e2218daf18a79241d1fd271faa237cc Mon Sep 17 00:00:00 2001 From: Pavel Raiskup 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. --- configure.ac | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ce34c15..c419e0e 100644 --- a/configure.ac +++ b/configure.ac @@ -24,15 +24,6 @@ AC_ARG_WITH([sysvinit], [WANT_SYSVINIT=0] ) -AC_ARG_WITH([upgrade-config], - AS_HELP_STRING([--with-upgrade-config=/file/path,/path2], - [List of files to be used as an upgrade configuration]), - [UPGRADE_CONFIG_LIST="$withval"], - [UPGRADE_CONFIG_LIST="upgrade_config.template"] -) - -AC_SUBST([UPGRADE_CONFIG_LIST]) - AM_CONDITIONAL([WANT_SYSVINIT], [test "$WANT_SYSVINIT" -eq 1]) # Instatiating generated files by sed instead of config.status. @@ -62,11 +53,11 @@ sed_subst_var_pattern(PREVPGENGINE) sed_subst_var_pattern(rawpkgdatadir) sed_subst_var_pattern(README_DIST) sed_subst_var_pattern(SU_POSTGRES) +sed_subst_var_pattern(sysconfdir) sed_subst_var_pattern(systemdunitsdir) sed_subst_var_pattern(userunitsdir) sed_subst_var_pattern(TEST_GEN_FILES_LIST) -sed_subst_var_pattern(VERSION) -sed_subst_var_pattern(UPGRADE_CONFIG_LIST)" +sed_subst_var_pattern(VERSION)" m4_define([add_sed_subst_var], [ SED_RULES="$SED_RULES -- cgit