Diff

Makefile @ 5935:a367bae38385

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Wed, 11 Dec 2013 22:31:48 +0000
parent 5933:56b1f151f4a3
child 6044:1ce05d38d1bb
line wrap: on
line diff
--- a/Makefile	Fri Nov 29 20:11:06 2013 +0000
+++ b/Makefile	Wed Dec 11 22:31:48 2013 +0000
@@ -17,7 +17,9 @@
 
 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)