diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-02-26 14:03:22 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-26 16:52:25 +0100 |
| commit | f7f516372e2218daf18a79241d1fd271faa237cc (patch) | |
| tree | 9f9653936f765241e606ed61b1c9eb1bb1720df3 /share/postgresql-setup/Makefile.inc | |
| parent | 1f35a8e32e9287d84b0d46f48a94eca85b59836f (diff) | |
| download | postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.tar.gz postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.tar.xz postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.zip | |
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.
Diffstat (limited to 'share/postgresql-setup/Makefile.inc')
| -rw-r--r-- | share/postgresql-setup/Makefile.inc | 16 |
1 files changed, 0 insertions, 16 deletions
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 |