aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Johan Oudinet <johan.oudinet@gmail.com>2018-02-13 14:27:11 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-20 21:51:58 +0200
commit44acf13f65a328592e431c7992ff1eab2e124b77 (patch)
tree1ab2ae6ae0ec288a9dca9339762419cad49d882a
parent3e44065ab5af177103cbf26724e48e300cffee5d (diff)
downloadbuildroot-44acf13f65a328592e431c7992ff1eab2e124b77.tar.gz
buildroot-44acf13f65a328592e431c7992ff1eab2e124b77.tar.bz2
ejabberd: Call check-erlang-lib script directly from its location
Avoid installing check-erlang-lib in the directory where the tarball is extracted. Instead, use an absolute path to its actual location, i.e.: $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/ejabberd/ejabberd.mk13
1 files changed, 2 insertions, 11 deletions
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 0f7af9b83e..acd52e5b38 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -23,24 +23,15 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
EJABBERD_DEPENDENCIES += linux-pam
endif
-# Install check-erlang-lib script to the directory in which the
-# package has been uncompressed, so it is available during the
-# configure step.
-define EJABBERD_INSTALL_CHECK_ERLANG_LIB
- $(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \
- $(@D)/check-erlang-lib
-endef
-
-EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB
-
EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler
# Guess answers for these tests, configure will bail out otherwise
# saying error: cannot run test program while cross compiling.
+EJABBERD_CHECK_LIB = $(TOPDIR)/$(EJABBERD_PKGDIR)/check-erlang-lib
EJABBERD_CONF_ENV = \
ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \
$(foreach lib,$(EJABBERD_ERLANG_LIBS), \
- ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`")
+ ac_cv_erlang_lib_dir_$(lib)="`$(EJABBERD_CHECK_LIB) $(lib)`")
EJABBERD_CONF_OPTS = \
--enable-system-deps \