From 1f35a8e32e9287d84b0d46f48a94eca85b59836f Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 25 Feb 2015 16:09:53 +0100 Subject: configury: remove DISTSUFF variable completely And add NAME_SERVICE, NAME_PACKAGE and NAME_BINARYBASE on its place. This allows packager fine-tune how the files are going to be generated. * Makefile.am: Better work with variables. * .gitignore: Ignore any (generated) service file. * configure.ac (DISTSUFF): Remove. (NAME_BIN_PFX, NAME_BIN_SFX, NAME_PKG_PFX, NAME_PKG_SFX) (NAME_SRV_PFX, NAME_SRV_SFX, NAME_SERVICE, NAME_PACKAGE) (NAME_BINARYBASE): New variables * doc/.gitignore: Ignore any man(1) page. * doc/Makefile.am (HELP2MAN_RUN): Fix the call to work also with various prefixes/suffixes. * README.rpm-dist.in: Use new variables. * legacy-sysv-script.in: Likewise. * postgresql-setup.in: Likewise. * m4/packaging.m4 (PGSETUP_SUBST_OPT): New macro, defines, substitutes and also fixes sed-rules. --- m4/packaging.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'm4') diff --git a/m4/packaging.m4 b/m4/packaging.m4 index 7160ae8..a50c4ba 100644 --- a/m4/packaging.m4 +++ b/m4/packaging.m4 @@ -33,3 +33,11 @@ m4_define([PGSETUP_SUBST_REQ], [ AC_MSG_ERROR([the \$$1 variable is not set]) ]) +# PGSETUP_SUBST_OPT(VARIABLE, DEFAULT, DESCRIPTION) +# ------------------------------------------------- +m4_define([PGSETUP_SUBST_OPT], [ + AC_ARG_VAR([$1], [$3]) + test -z "$[]$1" && + $1=$2 + add_sed_subst_var($1) +]) -- cgit