Automated merge with http://waqas.ath.cx/

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 0a96d2e5222b538200831b2eb5398e14fffb69d2..9fca034cd8d82c14c8d3235961703fa3ada433af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,22 +6,31 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 
+INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDCONFIG = $(SYSCONFDIR)
+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:
@@ -31,5 +40,8 @@ util/hashes.so:
        $(MAKE) install -C util-src
 
 prosody.install: prosody
-       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(SOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(CONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(MODULES)/';|;" prosody > prosody.install
+       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