Merge pull request #200 from ClusterLabs/fix-rpm

[build] fix FASEXECPREFIX handling and ship fence_ in -core rpm
main
Digimer 3 years ago committed by GitHub
commit f36d32f291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      configure.ac
  2. 2
      tools/Makefile.am

@ -103,9 +103,9 @@ AC_SUBST([OCFROOT])
ANVIL_PKG_CHECK_VAR([FASEXECPREFIX_TMP], [fence-agents], [exec_prefix], [${prefix}]) ANVIL_PKG_CHECK_VAR([FASEXECPREFIX_TMP], [fence-agents], [exec_prefix], [${prefix}])
if test "${prefix}" != "/usr"; then if test "${prefix}" != "/usr"; then
FASEXECPREFIX="${prefix}/$FASEXECPREFIX_TMP" FASEXECPREFIX="${prefix}/${FASEXECPREFIX_TMP}"
else else
FASEXECPREFIX="FASEXECPREFIX_TMP" FASEXECPREFIX="${FASEXECPREFIX_TMP}"
fi fi
AC_SUBST([FASEXECPREFIX]) AC_SUBST([FASEXECPREFIX])

@ -50,7 +50,7 @@ dist_sbin_SCRIPTS = \
striker-show-db-counts \ striker-show-db-counts \
striker-auto-initialize-all striker-auto-initialize-all
fencedir = $(FASEXECPREFIX)/sbin fencedir = ${FASEXECPREFIX}/sbin
dist_fence_SCRIPTS = \ dist_fence_SCRIPTS = \
fence_delay \ fence_delay \

Loading…
Cancel
Save