]> granicus.if.org Git - ejabberd/commitdiff
Fix 'make install' to work with new output from rebar list-deps
authorPaweł Chmielowski <pchmielowski@process-one.net>
Thu, 24 Aug 2017 09:43:47 +0000 (11:43 +0200)
committerPaweł Chmielowski <pchmielowski@process-one.net>
Thu, 24 Aug 2017 09:43:47 +0000 (11:43 +0200)
Makefile.in

index 56429d68f50e069454b7708f035b099e8b7d323d..3bee2f6491c626c248f1b596a605437e38a0e75b 100644 (file)
@@ -123,7 +123,7 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
 
 ifeq ($(MAKECMDGOALS),copy-files-sub)
 
-DEPS:=$(sort $(shell $(REBAR) list-deps|$(SED) -e '/^=/d;s/ .*//'))
+DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -e '/[a-z0-9_-]+\s/d;s/ .*//'))
 
 DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/COPY* deps/$(DEP)/LICENSE* deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
 DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES))