Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

repair wrong path for ocf_root when prefix ne default #138

Closed
wants to merge 3 commits into from
Closed

repair wrong path for ocf_root when prefix ne default #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f2b853
repair wrong path for ocf_root when prefix ne default
grueni Sep 26, 2012
06f8fd6
The same log entry is written twice when HA_LOGFILE=HA_DEBUGLOG
grueni Oct 6, 2012
800e5d4
Fix: no leading slahs for prefix, wrong variable
Nov 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -60,14 +60,27 @@ if BUILD_RGMANAGER
if BUILD_LINUX_HA if BUILD_LINUX_HA
$(LN_S) ${CLUSTERDATA} $(DESTDIR)${OCF_RA_DIR_PREFIX}/redhat $(LN_S) ${CLUSTERDATA} $(DESTDIR)${OCF_RA_DIR_PREFIX}/redhat
endif endif
$(INSTALL) -d $(DESTDIR)/$(LOGDIR) $(INSTALL) -d $(DESTDIR)$(LOGDIR)
endif endif


dist-clean-local: dist-clean-local:
rm -f autoconf automake autoheader $(TARFILES) rm -f autoconf automake autoheader $(TARFILES)


uninstall-local: 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 BUILT_SOURCES = .version
.version: .version:
Expand Down
26 changes: 8 additions & 18 deletions configure.ac
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -154,13 +154,11 @@ AC_ARG_WITH(initdir,
OCF_ROOT_DIR="/usr/lib/ocf" OCF_ROOT_DIR="/usr/lib/ocf"
AC_ARG_WITH(ocf-root, AC_ARG_WITH(ocf-root,
[ --with-ocf-root=DIR directory for OCF scripts [${OCF_ROOT_DIR}]], [ --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" ])
OCF_ROOT_DIR="$withval"; fi ])
HA_RSCTMPDIR=${localstatedir}/run/resource-agents HA_RSCTMPDIR=${localstatedir}/run/resource-agents
AC_ARG_WITH(rsctmpdir, AC_ARG_WITH(rsctmpdir,
[ --with-rsctmpdir=DIR directory for resource agents state files [${HA_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" ])
HA_RSCTMPDIR="$withval"; fi ])


AC_ARG_ENABLE([libnet], AC_ARG_ENABLE([libnet],
[ --enable-libnet Use libnet for ARP based funcationality, [default=try]], [ --enable-libnet Use libnet for ARP based funcationality, [default=try]],
Expand Down Expand Up @@ -241,7 +239,7 @@ AC_SUBST(INITDIR)
if test "${prefix}" = "/usr"; then if test "${prefix}" = "/usr"; then
INITDIRPREFIX="$INITDIR" INITDIRPREFIX="$INITDIR"
else else
INITDIRPREFIX="${prefix}/$INITDIR" INITDIRPREFIX="${prefix}$INITDIR"
fi fi


AC_SUBST(INITDIRPREFIX) AC_SUBST(INITDIRPREFIX)
Expand Down Expand Up @@ -393,26 +391,18 @@ HA_VARLIBHBDIR=${localstatedir}/lib/heartbeat
AC_DEFINE_UNQUOTED(HA_VARLIBHBDIR,"$HA_VARLIBHBDIR", Whatever this used to mean) AC_DEFINE_UNQUOTED(HA_VARLIBHBDIR,"$HA_VARLIBHBDIR", Whatever this used to mean)
AC_SUBST(HA_VARLIBHBDIR) 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_DEFINE_UNQUOTED(OCF_RA_DIR,"$OCF_RA_DIR", Location for OCF RAs)
AC_SUBST(OCF_RA_DIR) AC_SUBST(OCF_RA_DIR)


if test "${prefix}" = "/usr"; then OCF_RA_DIR_PREFIX="$OCF_RA_DIR"
OCF_RA_DIR_PREFIX="$OCF_RA_DIR"
else
OCF_RA_DIR_PREFIX="${prefix}/$OCF_RA_DIR"
fi
AC_SUBST(OCF_RA_DIR_PREFIX) 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_DEFINE_UNQUOTED(OCF_LIB_DIR,"$OCF_LIB_DIR", Location for shared code for OCF RAs)
AC_SUBST(OCF_LIB_DIR) AC_SUBST(OCF_LIB_DIR)


if test "${prefix}" = "/usr"; then OCF_LIB_DIR_PREFIX="$OCF_LIB_DIR"
OCF_LIB_DIR_PREFIX="$OCF_LIB_DIR"
else
OCF_LIB_DIR_PREFIX="${prefix}/$OCF_LIB_DIR"
fi
AC_SUBST(OCF_LIB_DIR_PREFIX) AC_SUBST(OCF_LIB_DIR_PREFIX)


dnl =============================================== dnl ===============================================
Expand Down Expand Up @@ -758,7 +748,7 @@ else
-Wno-strict-aliasing -Wno-strict-aliasing
-Wpointer-arith -Wpointer-arith
-Wstrict-prototypes -Wstrict-prototypes
-Wunsigned-char -Wunsigned-char
-Wwrite-strings" -Wwrite-strings"


# Additional warnings it might be nice to enable one day # Additional warnings it might be nice to enable one day
Expand Down
4 changes: 3 additions & 1 deletion heartbeat/ocf-shellfuncs.in
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ ha_log() {
[ -n "$HA_DEBUGLOG" ] [ -n "$HA_DEBUGLOG" ]
then then
: appending to $HA_DEBUGLOG : appending to $HA_DEBUGLOG
echo "$HA_LOGTAG: "`hadate`"${*}" >> $HA_DEBUGLOG if [ "$HA_LOGFILE"x != "$HA_DEBUGLOG"x ]; then
echo "$HA_LOGTAG: "`hadate`"${*}" >> $HA_DEBUGLOG
fi
fi fi
} }


Expand Down
2 changes: 1 addition & 1 deletion ldirectord/Makefile.am
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ harddir = $(sysconfdir)/ha.d/resource.d


.PHONY: install-exec-hook .PHONY: install-exec-hook
install-exec-hook: install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(harddir) $(MKDIR_P) $(DESTDIR)$(harddir)
cd $(DESTDIR)$(harddir) && ln -s -f $(sbindir)/ldirectord . cd $(DESTDIR)$(harddir) && ln -s -f $(sbindir)/ldirectord .


.PHONY: uninstall-hook .PHONY: uninstall-hook
Expand Down
2 changes: 1 addition & 1 deletion ldirectord/init.d/Makefile.am
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ initd_SCRIPTS = ldirectord


install-initdSCRIPTS: $(initd_SCRIPTS) install-initdSCRIPTS: $(initd_SCRIPTS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(initddir) $(MKDIR_P) $(DESTDIR)$(initddir)
@list='$(initd_SCRIPTS)'; for p in $$list; do \ @list='$(initd_SCRIPTS)'; for p in $$list; do \
f="`echo $$p|sed '$(transform)'`"; \ f="`echo $$p|sed '$(transform)'`"; \
if test -f $$p; then \ if test -f $$p; then \
Expand Down