projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server_event: Remove needless scoping around add_task
[prosody.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 0fa8b28eeb4ead9465017b46f32327e5d9fa6919..e7a36ffe8cc1c1e7d201a4b7b044f0fcaafae6df 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,20
+3,23
@@
include config.unix
BIN = $(DESTDIR)$(PREFIX)/bin
CONFIG = $(DESTDIR)$(SYSCONFDIR)
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
DATA = $(DESTDIR)$(DATADIR)
MAN = $(DESTDIR)$(PREFIX)/share/man
-INSTALLEDSOURCE = $(
PREFIX)/lib
/prosody
+INSTALLEDSOURCE = $(
LIBDIR)
/prosody
INSTALLEDCONFIG = $(SYSCONFDIR)
INSTALLEDCONFIG = $(SYSCONFDIR)
-INSTALLEDMODULES = $(
PREFIX)/lib
/prosody/modules
+INSTALLEDMODULES = $(
LIBDIR)
/prosody/modules
INSTALLEDDATA = $(DATADIR)
.PHONY: all clean install
all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
$(MAKE) -C util-src install
INSTALLEDDATA = $(DATADIR)
.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 || true
+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: 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)
@@
-27,20
+30,19
@@
install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
install -m755 ./prosody.install $(BIN)/prosody
install -m755 ./prosodyctl.install $(BIN)/prosodyctl
install -m644 core/* $(SOURCE)/core
install -m755 ./prosody.install $(BIN)/prosody
install -m755 ./prosodyctl.install $(BIN)/prosodyctl
install -m644 core/* $(SOURCE)/core
- install -m644 net/* $(SOURCE)/net
+ 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
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
+ umask 0022 && cp -r plugins/* $(MODULES)
install -m644 certs/* $(CONFIG)/certs
install -m644 certs/* $(CONFIG)/certs
- install -d $(MODULES)/adhoc
- install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
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
+ 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 || true
$(MAKE) install -C util-src
clean:
$(MAKE) install -C util-src
clean:
@@
-54,7
+56,8
@@
util/%.so:
$(MAKE) install -C util-src
%.install: %
$(MAKE) install -C util-src
%.install: %
- sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+ 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)/';|;" < $^ > $@
s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@
@@
-63,7
+66,7
@@
prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
- test -
e
.hg/dirstate && \
+ test -
f
.hg/dirstate && \
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
test -f prosody.release && \
cp prosody.release $@ || true
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
test -f prosody.release && \
cp prosody.release $@ || true