Merge 0.10->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 0a96d2e5222b538200831b2eb5398e14fffb69d2..06e67c9ce119df61296797db8ebdf2357eeec1a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,33 +3,82 @@ include config.unix
 
 BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
-MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
-SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
+SOURCE = $(DESTDIR)$(LIBDIR)/prosody
+DATA = $(DESTDIR)$(DATADIR)
+MAN = $(DESTDIR)$(PREFIX)/share/man
 
-all:
-       $(MAKE) all -C util-src
+INSTALLEDSOURCE = $(LIBDIR)/prosody
+INSTALLEDCONFIG = $(SYSCONFDIR)
+INSTALLEDMODULES = $(LIBDIR)/prosody/modules
+INSTALLEDDATA = $(DATADIR)
 
-install: prosody.install util/encodings.so util/encodings.so
+.PHONY: all clean install
+
+all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
+       $(MAKE) -C util-src install
+ifeq ($(EXCERTS),yes)
+       -$(MAKE) -C certs localhost.crt example.com.crt
+endif
+
+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 ./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 -m755 ./prosody.install $(BIN)/prosody
+       install -m755 ./prosodyctl.install $(BIN)/prosodyctl
+       install -m644 core/*.lua $(SOURCE)/core
+       install -m644 net/*.lua $(SOURCE)/net
+       install -d $(SOURCE)/net/http $(SOURCE)/net/websocket
+       install -m644 net/http/*.lua $(SOURCE)/net/http
+       install -m644 net/websocket/*.lua $(SOURCE)/net/websocket
+       install -m644 util/*.lua $(SOURCE)/util
+       install -m644 util/*.so $(SOURCE)/util
+       install -d $(SOURCE)/util/sasl
+       install -m644 util/sasl/* $(SOURCE)/util/sasl
+       umask 0022 && cp -r plugins/* $(MODULES)
+       install -m644 certs/* $(CONFIG)/certs
+       install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+       test -f $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+       -test -f prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version
        $(MAKE) install -C util-src
 
 clean:
        rm -f prosody.install
+       rm -f prosodyctl.install
+       rm -f prosody.cfg.lua.install
+       rm -f prosody.version
        $(MAKE) clean -C util-src
 
-util/encodings.so:
-       $(MAKE) install -C util-src
+test:
+       cd tests && $(RUNWITH) test.lua 0
+       # Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
 
-util/hashes.so:
+util/%.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
+%.install: %
+       sed "1s| lua$$| $(RUNWITH)|; \
+               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.cfg.lua.install: prosody.cfg.lua.dist
+       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
+
+%.version: %.release
+       cp $^ $@
+
+%.version: .hg_archival.txt
+       sed -n 's/^node: \(............\).*/\1/p' $^ > $@
+
+%.version: .hg/dirstate
+       hexdump -n6 -e'6/1 "%02x"' $^ > $@
+
+%.version:
+       echo unknown > $@
+