aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2bebb836..9fca034c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,19 +14,23 @@ INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
all:
$(MAKE) all -C util-src
-install: prosody.install util/encodings.so util/encodings.so
+install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+ install -d $(CONFIG)/certs
install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
install ./prosody.install $(BIN)/prosody
install -m644 core/* $(SOURCE)/core
install -m644 net/* $(SOURCE)/net
install -m644 util/* $(SOURCE)/util
install -m644 plugins/* $(MODULES)
- install -m644 prosody.cfg.lua.dist $(CONFIG)/prosody.cfg.lua
+ install -m644 certs/* $(CONFIG)/certs
+ install -m644 plugins/* $(MODULES)
+ install -m644 prosody.cfg.lua $(CONFIG)/prosody.cfg.lua
$(MAKE) install -C util-src
clean:
rm -f prosody.install
+ rm -f prosody.cfg.lua
$(MAKE) clean -C util-src
util/encodings.so:
@@ -38,3 +42,6 @@ util/hashes.so:
prosody.install: prosody
sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody > prosody.install
+prosody.cfg.lua:
+ sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua
+