diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-09-21 17:51:13 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-09-21 17:51:13 +0200 |
| commit | e57c1896f716bf53d2256feab6a08ce41c358c9e (patch) | |
| tree | 3a8c74e6a8c94012ed1634118ac578f6df51f9d2 /Makefile.in | |
| parent | Add set_loglevel command (EJABS-2524) (diff) | |
Avoid wrong failing cases on make install (#468)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index ffd1d30f..f7b30d46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -137,9 +137,9 @@ install: all $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl # Elixir binaries [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) - -[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex - -[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir - -[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix + [ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true + [ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true + [ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true # # Init script $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \ @@ -168,22 +168,23 @@ install: all $(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR) $(INSTALL) -m 750 $(O_USER) tools/joincluster $(PBINDIR) $(INSTALL) -m 750 $(O_USER) tools/leavecluster $(PBINDIR) - -[ -f deps/p1_pam/priv/bin/epam ] \ - && $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR) + [ -f deps/p1_pam/priv/bin/epam ] \ + && $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR) \ + || true # # Binary system libraries $(INSTALL) -d $(SODIR) $(INSTALL) -m 644 $(DLLs) $(SODIR) - -[ -f $(SODIR)/jiffy.so ] && (cd $(PRIVDIR); ln -s lib/jiffy.so; true) - -[ -f $(SODIR)/sqlite3_drv.so ] && (cd $(PRIVDIR); ln -s lib/sqlite3_drv.so; true) + [ -f $(SODIR)/jiffy.so ] && (cd $(PRIVDIR); ln -s lib/jiffy.so; true) || true + [ -f $(SODIR)/sqlite3_drv.so ] && (cd $(PRIVDIR); ln -s lib/sqlite3_drv.so; true) || true # # Translated strings $(INSTALL) -d $(MSGSDIR) $(INSTALL) -m 644 priv/msgs/*.msg $(MSGSDIR) # # Copy lite.sql - -[ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR) - -[ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR) + [ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR) || true + [ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR) || true # # Spool directory $(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR) |