aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-11 22:31:48 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-11 22:31:48 +0000
commit02a0ea1c2a31f4cbb28b862eba1c23b248e35cab (patch)
treee918bc1917077531945dec03b0bc9381adfbe0ad /Makefile
parent89969b0c91c2cf4db6d20f0ecd78045dfccbb3e6 (diff)
parent8625bc8b8f473f84da682541a7965d9aca838d40 (diff)
downloadprosody-02a0ea1c2a31f4cbb28b862eba1c23b248e35cab.tar.gz
prosody-02a0ea1c2a31f4cbb28b862eba1c23b248e35cab.zip
Merge 0.9->0.10
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)