diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-06-19 10:40:33 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-06-19 10:41:06 +1000 |
| commit | 7b870f5a30d87d07cd93c67b0ad56818de502af3 (patch) | |
| tree | 058a6632049c74997bb4c9a94725233da3cd5fa6 /Makefile.in | |
| parent | Some deps have their DLLs in "priv" directory (not "priv/lib"). (diff) | |
Better DLL location detection when executing `make install`
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index d19be2e8..a663f9a8 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) |