Merge branch 'master' into anvil-tools-dev

3 years ago · 521633f3eb
parent 75a4c8d709 f36d32f291
commit 521633f3eb
2 changed files with 3 additions and 3 deletions
--- 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])

--- 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 \