From 9094981751e776fa93537c91bc0e678f4d806b91 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Feb 2015 15:57:08 +0100 Subject: configury: another scl-izing commit * Makefile.am: Move systemd directory definitions into configure.ac. This is then easily configurable via config.site. * configure.ac (PGENGINE, PG_CTL_BIN): Remove, bindir is sufficient. (PREVMAJORVERSION, PREVPGENGINE): Removed. It si configurable now. (INIDB_SCLS): Generalize into SCLS variable. (SCLS): Moved from INIDB_SCLS. (PGDATADIR): Default changed to have ${prefix} inside. (SED_RULES): Remove unused variables (or to not be used, TODO for next commit). (conf_dir): New macro to define config.site friendly directory variable. (SCL_SHELL_WRAPPER): Convenient macro to generate appropriate call to scl binary (only when building for software collections). * postgresql-check-db-dir.in: Use new variable layout. * postgresql-ctl.in: Likewise. * postgresql-setup.in: Likewise. * postgresql.service.in: Likewise. This fixes regression of not using ${bindir} properly. --- Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b575702..21d448a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,17 +28,14 @@ SUBDIRS = . doc tests bin_SCRIPTS = $(setup) libexec_SCRIPTS = $(ctl) $(checkdb) -userunitsdir = /etc/systemd/system +legacyscriptsdir = $(systemdlegacyscriptsdir)/$(NAME_SERVICE) # TODO: Ideally, 'make distcheck' should check every file we generate. if WANT_SYSVINIT -initscriptsdir = $(sysconfdir)/rc.d/init.d initscripts_DATA = $(initscript) else -systemdunitsdir = $(prefix)/lib/systemd/system systemdunits_DATA = $(service) $(serviceat) -systemdlegacyscriptsdir = $(libexecdir)/initscripts/legacy-actions/$(NAME_SERVICE) -systemdlegacyscripts_SCRIPTS = initdb upgrade +legacyscripts_SCRIPTS = initdb upgrade endif doc_DATA = $(README_DIST_BASENAME) -- cgit