X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=Makefile;h=9fca034cd8d82c14c8d3235961703fa3ada433af;hb=d51f98da780c279d26930d9a51f925ad62a5f21f;hp=00826f5490206bbe1683ea37545d244b9c798074;hpb=7747fe11a336edcd019b24b2e255100d9fdf51ac;p=prosody.git

diff --git a/Makefile b/Makefile
index 00826f54..9fca034c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,44 @@ include config.unix
 BIN = $(DESTDIR)$(PREFIX)/bin
 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
 
-SOURCEDIR = $(DESTDIR)$(PREFIX)/lib/prosody
 
 all:
 	$(MAKE) all -C util-src
 
-install: prosody
-	install -d $(BIN) $(CONFIG) $(MODULES)
-	install ./prosody $(BIN)
+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 certs/* $(CONFIG)/certs
 	install -m644 plugins/* $(MODULES)
-	install -m644 prosody.cfg.lua $(CONFIG)
+	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:
+	$(MAKE) install -C util-src
+
+util/hashes.so:
+	$(MAKE) install -C util-src
+
+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
+