pkg-rebar: remove redundant / in front of $($(PKG)_ERLANG_LIBDIR)
Sometimes $(1)/$($(PKG)_ERLANG_LIBDIR) is used, sometimes $(1)$($(PKG)_ERLANG_LIBDIR). Make this consistent, with /. Therefore, remove the leading / from $($(PKG)_ERLANG_LIBDIR). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
0fe7151117
commit
417ade5f2b
@ -44,7 +44,7 @@ REBAR_TARGET_DEPS_ENV = \
|
||||
# Install an Erlang application from $(@D).
|
||||
#
|
||||
# i.e., define a recipe that installs the "bin ebin priv $(2)" directories
|
||||
# from $(@D) to $(1)$($(PKG)_ERLANG_LIBDIR).
|
||||
# from $(@D) to $(1)/$($(PKG)_ERLANG_LIBDIR).
|
||||
#
|
||||
# argument 1 should typically be $(HOST_DIR), $(TARGET_DIR),
|
||||
# or $(STAGING_DIR).
|
||||
@ -59,7 +59,7 @@ define install-erlang-directories
|
||||
$(INSTALL) -d $(1)/$($(PKG)_ERLANG_LIBDIR)
|
||||
for dir in bin ebin priv $(2); do \
|
||||
if test -d $(@D)/$$dir; then \
|
||||
cp -r $(@D)/$$dir $(1)$($(PKG)_ERLANG_LIBDIR); \
|
||||
cp -r $(@D)/$$dir $(1)/$($(PKG)_ERLANG_LIBDIR); \
|
||||
fi; \
|
||||
done
|
||||
endef
|
||||
@ -122,7 +122,7 @@ $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1))))
|
||||
# for host packages, or $(STAGING_DIR) for target packages.
|
||||
#
|
||||
$(2)_ERLANG_LIBDIR = \
|
||||
/usr/lib/erlang/lib/$$($$(PKG)_ERLANG_APP)-$$($$(PKG)_VERSION)
|
||||
usr/lib/erlang/lib/$$($$(PKG)_ERLANG_APP)-$$($$(PKG)_VERSION)
|
||||
|
||||
# If a host package, inherit <pkg>_USE_BUNDLED_REBAR from the target
|
||||
# package, if not explicitly defined. Otherwise, default to NO.
|
||||
|
Loading…
Reference in New Issue
Block a user