diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-03-04 16:21:52 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-03-04 16:38:57 +0100 |
| commit | 610bb619cc5e00860c6846fa36a03609aaea3595 (patch) | |
| tree | eece7bb2555e3a6dafd6494bc8b928a7b5295617 /Makefile.am | |
| parent | 834c0e34d7828f96550c7a7bbb94f3dcaacd2029 (diff) | |
| download | postgresql-setup-610bb619cc5e00860c6846fa36a03609aaea3595.tar.gz postgresql-setup-610bb619cc5e00860c6846fa36a03609aaea3595.tar.xz postgresql-setup-610bb619cc5e00860c6846fa36a03609aaea3595.zip | |
configury: detect systemd/sysvinit systems
Fix the AC_ARG_WITH misuse. If WANT_SYSVINIT is unset, guess
correct value.
Don't treat intermediate files as those to be checked for correct
syntax errors (or unexpanded @variables@).
* Makefile.am: Move readme_* intermediate files into separate
variable.
* configure.ac: If WANT_SYSVINIT is empty (no explicit request),
try to detect systemd's presence by checking for systemctl
command. Print out after AC_OUTPUT information what init system
will be used.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 68717c9..bad62ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ readme_dist_sed = README.rpm-dist.sed readme_template = README.rpm-dist.template EXTRA_DIST = +INTERMEDIATE_FILES = GENERATED_FILES = CLEANFILES = @@ -105,12 +106,14 @@ GENERATED_FILES += \ $(pkgsysconf_DATA) \ $(systemdunits_DATA) \ $(initscripts_DATA) \ - $(legacyscripts_SCRIPTS) \ + $(legacyscripts_SCRIPTS) + +INTERMEDIATE_FILES += \ $(readme_dist_m4) \ $(readme_dist_sed) \ $(readme_dist_db) -CLEANFILES += $(GENERATED_FILES) $(TEST_GEN_FILES_LIST) +CLEANFILES += $(GENERATED_FILES) $(TEST_GEN_FILES_LIST) $(INTERMEDIATE_FILES) $(TEST_GEN_FILES_LIST): $(GENERATED_FILES) $(AM_V_GEN)rm -rf $(TEST_GEN_FILES_LIST) && \ |