More Makefile improvements

diff --git a/Makefile b/Makefile
index 00826f5490206bbe1683ea37545d244b9c798074..cca246a6b8b4274b5b26f73ccf338e3a374b2b22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,28 @@ include config.unix
 BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
-
-SOURCEDIR = $(DESTDIR)$(PREFIX)/lib/prosody
+SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 
 all:
        $(MAKE) all -C util-src
 
-install: prosody
-       install -d $(BIN) $(CONFIG) $(MODULES)
+install: prosody util/encodings.so util/encodings.so
+
+       install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+       install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install ./prosody $(BIN)
+       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)
        $(MAKE) install -C util-src
 
 clean:
        $(MAKE) clean -C util-src
+
+util/encodings.so:
+       $(MAKE) install -C util-src
+
+util/hashes.so:
+       $(MAKE) install -C util-src