Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

repair wrong path for ocf_root when prefix ne default

  • Loading branch information...
commit 3f2b853ebb485ad33b17def5db5f08df09267188 1 parent a796f39
grueni authored
Showing with 21 additions and 18 deletions.
  1. +14 −1 Makefile.am
  2. +7 −17 configure.ac
15 Makefile.am
View
@@ -67,7 +67,20 @@ dist-clean-local:
rm -f autoconf automake autoheader $(TARFILES)
uninstall-local:
- rmdir $(DESTDIR)/$(LOGDIR) || :;
+if BUILD_LINUX_HA
+ rm -rf $(DESTDIR)$(HA_RSCTMPDIR)
+ rm -f ${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-binaries
+ rm -f ${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-directories
+ rm -f ${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-returncodes
+ rm -f ${OCF_RA_DIR_PREFIX}/heartbeat/.ocf-shellfuncs
+endif
+if BUILD_RGMANAGER
+if BUILD_LINUX_HA
+ rm -rf $(DESTDIR)${OCF_RA_DIR_PREFIX}/redhat
+endif
+ rm -rf $(DESTDIR)$(LOGDIR) || :;
+endif
+
BUILT_SOURCES = .version
.version:
24 configure.ac
View
@@ -154,13 +154,11 @@ AC_ARG_WITH(initdir,
OCF_ROOT_DIR="/usr/lib/ocf"
AC_ARG_WITH(ocf-root,
[ --with-ocf-root=DIR directory for OCF scripts [${OCF_ROOT_DIR}]],
- [ if test x"$withval" = xprefix; then OCF_ROOT_DIR=${prefix}; else
- OCF_ROOT_DIR="$withval"; fi ])
+ [ OCF_ROOT_DIR="$withval" ])
HA_RSCTMPDIR=${localstatedir}/run/resource-agents
AC_ARG_WITH(rsctmpdir,
[ --with-rsctmpdir=DIR directory for resource agents state files [${HA_RSCTMPDIR}]],
- [ if test x"$withval" = xprefix; then HA_RSCTMPDIR=${prefix}; else
- HA_RSCTMPDIR="$withval"; fi ])
+ [ HA_RSCTMPDIR="$withval" ])
AC_ARG_ENABLE([libnet],
[ --enable-libnet Use libnet for ARP based funcationality, [default=try]],
@@ -393,26 +391,18 @@ HA_VARLIBHBDIR=${localstatedir}/lib/heartbeat
AC_DEFINE_UNQUOTED(HA_VARLIBHBDIR,"$HA_VARLIBHBDIR", Whatever this used to mean)
AC_SUBST(HA_VARLIBHBDIR)
-OCF_RA_DIR="${OCF_ROOT_DIR}/resource.d/"
+OCF_RA_DIR="${OCF_ROOT_DIR}/resource.d"
AC_DEFINE_UNQUOTED(OCF_RA_DIR,"$OCF_RA_DIR", Location for OCF RAs)
AC_SUBST(OCF_RA_DIR)
-if test "${prefix}" = "/usr"; then
- OCF_RA_DIR_PREFIX="$OCF_RA_DIR"
-else
- OCF_RA_DIR_PREFIX="${prefix}/$OCF_RA_DIR"
-fi
+OCF_RA_DIR_PREFIX="$OCF_RA_DIR"
AC_SUBST(OCF_RA_DIR_PREFIX)
-OCF_LIB_DIR="${OCF_ROOT_DIR}/lib/"
+OCF_LIB_DIR="${OCF_ROOT_DIR}/lib"
AC_DEFINE_UNQUOTED(OCF_LIB_DIR,"$OCF_LIB_DIR", Location for shared code for OCF RAs)
AC_SUBST(OCF_LIB_DIR)
-if test "${prefix}" = "/usr"; then
- OCF_LIB_DIR_PREFIX="$OCF_LIB_DIR"
-else
- OCF_LIB_DIR_PREFIX="${prefix}/$OCF_LIB_DIR"
-fi
+OCF_LIB_DIR_PREFIX="$OCF_LIB_DIR"
AC_SUBST(OCF_LIB_DIR_PREFIX)
dnl ===============================================
@@ -758,7 +748,7 @@ else
-Wno-strict-aliasing
-Wpointer-arith
-Wstrict-prototypes
- -Wunsigned-char
+ -Wunsigned-char
-Wwrite-strings"
# Additional warnings it might be nice to enable one day
Please sign in to comment.
Something went wrong with that request. Please try again.