From 36bcaa587f309dd834fb194729d031a50ebf6690 Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Wed, 24 Nov 2021 21:58:16 +0100 Subject: [PATCH] [build] fix FASEXECPREFIX handling and ship fence_ in -core rpm Signed-off-by: Fabio M. Di Nitto --- configure.ac | 4 ++-- tools/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6b8de709..657aff01 100644 --- a/configure.ac +++ b/configure.ac @@ -103,9 +103,9 @@ AC_SUBST([OCFROOT]) ANVIL_PKG_CHECK_VAR([FASEXECPREFIX_TMP], [fence-agents], [exec_prefix], [${prefix}]) if test "${prefix}" != "/usr"; then - FASEXECPREFIX="${prefix}/$FASEXECPREFIX_TMP" + FASEXECPREFIX="${prefix}/${FASEXECPREFIX_TMP}" else - FASEXECPREFIX="FASEXECPREFIX_TMP" + FASEXECPREFIX="${FASEXECPREFIX_TMP}" fi AC_SUBST([FASEXECPREFIX]) diff --git a/tools/Makefile.am b/tools/Makefile.am index d2b6c074..d2d1c3ba 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -50,7 +50,7 @@ dist_sbin_SCRIPTS = \ striker-show-db-counts \ striker-auto-initialize-all -fencedir = $(FASEXECPREFIX)/sbin +fencedir = ${FASEXECPREFIX}/sbin dist_fence_SCRIPTS = \ fence_delay \