aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-11 22:32:17 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-11 22:32:17 +0000
commit45408a488aa7a795a70f4d2f0a5a613dc64fdb57 (patch)
treefafb81c87c0f7408e936a1df9f7f3d4a7c754b37 /Makefile
parente54b3961955e5491d6ac4e987a7f98de9cd0e171 (diff)
parent33ea9b5ab750619bac0431e71e5d636ce463fe0c (diff)
downloadprosody-45408a488aa7a795a70f4d2f0a5a613dc64fdb57.tar.gz
prosody-45408a488aa7a795a70f4d2f0a5a613dc64fdb57.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f61fda17..c5390599 100644
--- a/Makefile
+++ b/Makefile
@@ -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)