Merge 0.10->trunk

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index c5390599064405960c303b55f095f2c51fa02b41..06e67c9ce119df61296797db8ebdf2357eeec1a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@ 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
 
-INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDSOURCE = $(LIBDIR)/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
-INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDMODULES = $(LIBDIR)/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
 .PHONY: all clean install
@@ -18,7 +18,7 @@ INSTALLEDDATA = $(DATADIR)
 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 || true
+       -$(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
@@ -29,10 +29,11 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        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 core/*.lua $(SOURCE)/core
        install -m644 net/*.lua $(SOURCE)/net
-       install -d $(SOURCE)/net/http
+       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
@@ -40,8 +41,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        umask 0022 && cp -r plugins/* $(MODULES)
        install -m644 certs/* $(CONFIG)/certs
        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 -m644 prosody.version $(SOURCE)/prosody.version || true
+       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:
@@ -51,11 +52,15 @@ clean:
        rm -f prosody.version
        $(MAKE) clean -C util-src
 
+test:
+       cd tests && $(RUNWITH) test.lua 0
+       # Skipping: cd tests && RUNWITH=$(RUNWITH) ./test_util_json.sh
+
 util/%.so:
        $(MAKE) install -C util-src
 
 %.install: %
-       sed "1s/\blua\b/$(RUNWITH)/; \
+       sed "1s| lua$$| $(RUNWITH)|; \
                s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
                s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
                s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
@@ -64,8 +69,16 @@ util/%.so:
 prosody.cfg.lua.install: prosody.cfg.lua.dist
        sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
 
-prosody.version: $(wildcard prosody.release .hg/dirstate)
-       test -e .hg/dirstate && \
-               hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
-       test -f prosody.release && \
-               cp prosody.release $@ || true
+%.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 > $@
+
+