From 7b870f5a30d87d07cd93c67b0ad56818de502af3 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Wed, 19 Jun 2013 10:40:33 +1000 Subject: [PATCH] Better DLL location detection when executing `make install` --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d19be2e8b..a663f9a85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,6 +103,8 @@ spec: $(ERL) -noinput +B -pa ebin -pa deps/*/ebin -eval \ 'case xml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.' +DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so) + install: all # # Configuration files @@ -152,9 +154,7 @@ install: all # # Binary system libraries $(INSTALL) -d $(SODIR) - #$(INSTALL) -m 644 priv/lib/*.so $(SODIR) - $(INSTALL) -m 644 deps/*/priv/lib/*.so $(SODIR) - $(INSTALL) -m 644 deps/*/priv/*.so $(SODIR) + $(INSTALL) -m 644 $(DLLs) $(SODIR) # # Translated strings $(INSTALL) -d $(MSGSDIR)