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. --- share/postgresql-setup/Makefile.inc | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 share/postgresql-setup/Makefile.inc (limited to 'share/postgresql-setup') diff --git a/share/postgresql-setup/Makefile.inc b/share/postgresql-setup/Makefile.inc deleted file mode 100644 index d202fc6..0000000 --- a/share/postgresql-setup/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -upgrade_config = %D%/upgrade.conf - -rawpkgdatadir = $(datadir)/postgresql-setup -rawpkgdata_DATA = \ - $(upgrade_config) - -$(UPGRADE_CONFIG_LIST): - @echo " error: config file '$@' does not exist" && false - -$(upgrade_config): $(UPGRADE_CONFIG_LIST) $(c_s) - $(INSTANTIATE_CONV) \ - && $(config_builder) "$(UPGRADE_CONFIG_LIST)" > $@ - -GENERATED_FILES += $(upgrade_config) - -# vim: ft=automake noet -- cgit