Second merge from waqas

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index cca246a6b8b4274b5b26f73ccf338e3a374b2b22..606d92b07cf88c5a3e9f0e8b97c82a95fcef3c68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,33 @@ BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+DATA = $(DESTDIR)$(DATADIR)
 
-all:
-       $(MAKE) all -C util-src
+INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDCONFIG = $(SYSCONFDIR)
+INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDDATA = $(DATADIR)
 
-install: prosody util/encodings.so util/encodings.so
+all: prosody.install prosody.cfg.lua.install
+       $(MAKE) -C util-src install
 
-       install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so
+       install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
+       install -d $(CONFIG)/certs
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
-       install ./prosody $(BIN)
+       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 $(CONFIG)
+       install -m644 certs/* $(CONFIG)/certs
+       install -m644 plugins/* $(MODULES)
+       test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
        $(MAKE) install -C util-src
 
 clean:
+       rm -f prosody.install
+       rm -f prosody.cfg.lua.install
        $(MAKE) clean -C util-src
 
 util/encodings.so:
@@ -29,3 +39,16 @@ util/encodings.so:
 
 util/hashes.so:
        $(MAKE) install -C util-src
+
+util/pposix.so:
+       $(MAKE) install -C util-src
+
+prosody.install: prosody
+       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+               s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
+               s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
+               s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install
+
+prosody.cfg.lua.install:
+       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
+