Makefile, util-src/Makefile: Add .PHONY, reorganise util-src/Makefile

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 93549243b3f1f5fa4c377539c22cc024ab5e411b..1af6da639b7ce27f8fda42a0ac15c862350ccc40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,28 +6,39 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 DATA = $(DESTDIR)$(DATADIR)
+MAN = $(DESTDIR)$(PREFIX)/share/man
 
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
+.PHONY: all clean install
+
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
        $(MAKE) -C util-src install
 
 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
        install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
        install -m750 -d $(DATA)
+       install -d $(MAN)/man1
        install -d $(CONFIG)/certs
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install -m755 ./prosody.install $(BIN)/prosody
        install -m755 ./prosodyctl.install $(BIN)/prosodyctl
        install -m644 core/* $(SOURCE)/core
        install -m644 net/* $(SOURCE)/net
-       install -m644 util/* $(SOURCE)/util
-       install -m644 plugins/* $(MODULES)
+       install -m644 util/*.lua $(SOURCE)/util
+       install -m644 util/*.so $(SOURCE)/util
+       install -d $(SOURCE)/util/sasl
+       install -m644 util/sasl/* $(SOURCE)/util/sasl
+       install -m644 plugins/*.lua $(MODULES)
+       install -d $(MODULES)/muc
+       install -m644 plugins/muc/* $(MODULES)/muc
        install -m644 certs/* $(CONFIG)/certs
-       install -m644 plugins/* $(MODULES)
+       install -d $(MODULES)/adhoc
+       install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
+       install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
        test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
        test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
        $(MAKE) install -C util-src
@@ -67,7 +78,7 @@ prosody.cfg.lua.install:
        sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
 
 prosody.release:
-       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%01x"' .hg/dirstate \
+       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
            > prosody.version || true
 
 prosody.version: prosody.release