diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-11 22:32:17 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-11 22:32:17 +0000 |
commit | 0b0e5d0825a2fa2b7ef28423824886b30bb916d7 (patch) | |
tree | fafb81c87c0f7408e936a1df9f7f3d4a7c754b37 /Makefile | |
parent | 935e515d111d931801910d19771023afffc102d3 (diff) | |
parent | 02a0ea1c2a31f4cbb28b862eba1c23b248e35cab (diff) | |
download | prosody-0b0e5d0825a2fa2b7ef28423824886b30bb916d7.tar.gz prosody-0b0e5d0825a2fa2b7ef28423824886b30bb916d7.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -17,7 +17,9 @@ INSTALLEDDATA = $(DATADIR) all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version $(MAKE) -C util-src install - $(MAKE) -C certs localhost.crt example.com.crt +ifeq ($(EXCERTS),yes) + $(MAKE) -C certs localhost.crt example.com.crt || true +endif install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) |