]> granicus.if.org Git - ejabberd/commitdiff
Adopt 'make install' to updated output from 'rebar list-deps'
authorPaweÅ\82 Chmielowski <pchmielowski@process-one.net>
Thu, 26 Oct 2017 09:20:48 +0000 (11:20 +0200)
committerPaweł Chmielowski <pchmielowski@process-one.net>
Thu, 26 Oct 2017 09:21:41 +0000 (11:21 +0200)
Makefile.in

index 0edd8c844598a4bc1b3365c7da2554a43df46c6a..3d9388df71077f8a633e2e0fc53a12380e1ee101 100644 (file)
@@ -132,7 +132,7 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
 
 ifeq ($(MAKECMDGOALS),copy-files-sub)
 
-DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -e '/[a-z0-9_-]+\s/d;s/ .*//'))
+DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -ne '/^[a-zA-Z0-9_-]\{1,\} \(TAG\|REV\)/s/^\([^ ]*\).*/\1/p'))
 
 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 %/eimp deps/elixir/ebin/elixir.app,$(DEPS_FILES))