Skip to content

Commit

Permalink
Fix make/release.mk
Browse files Browse the repository at this point in the history
  • Loading branch information
oalbrigt committed Jan 10, 2017
1 parent 50791f0 commit a7c93fa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ AC_ARG_WITH(initdir,
[ --with-initdir=DIR directory for init (rc) scripts [${INITDIR}]],
[ INITDIR="$withval" ])

OCF_ROOT_DIR="/usr/lib/ocf"
OCF_ROOT_DIR="${prefix}/lib/ocf"
AC_ARG_WITH(ocf-root,
[ --with-ocf-root=DIR directory for OCF scripts [${OCF_ROOT_DIR}]],
[ OCF_ROOT_DIR="$withval" ])
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ halibdir = $(libexecdir)/heartbeat
ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat

dtddir = $(datadir)/$(PACKAGE_NAME)
dtd_DATA = ra-api-1.dtd
dtd_DATA = ra-api-1.dtd metadata.rng

if USE_IPV6ADDR_AGENT
ocf_PROGRAMS = IPv6addr
Expand Down Expand Up @@ -167,4 +167,4 @@ hb_DATA = shellfuncs
check: $(ocf_SCRIPTS:=.check)

%.check: %
OCF_ROOT=. OCF_FUNCTIONS_DIR=. ./$< meta-data | xmllint --noout --relaxng metadata.rng -
OCF_ROOT=$(abs_srcdir) OCF_FUNCTIONS_DIR=$(abs_srcdir) ./$< meta-data | xmllint --path $(abs_srcdir) --noout --relaxng $(abs_srcdir)/metadata.rng -
2 changes: 1 addition & 1 deletion make/release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ endif
tarballs: tag
./autogen.sh
./configure
make distcheck
DISTCHECK_CONFIGURE_FLAGS="--with-systemdsystemunitdir=no" make distcheck

sha256: tarballs $(project)-$(version).sha256

Expand Down

0 comments on commit a7c93fa

Please sign in to comment.