X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=Makefile;h=9d0c3d235378ac59aa378981e1d6c8a304d3ad36;hb=abf75ad4dcd0950d64ee600aed0971e4f525259a;hp=0e17e1e4d603e054249af6018159d59a792902ad;hpb=e0c9712a17ea5ae2c744732f3804877626ffe07f;p=prosody.git

diff --git a/Makefile b/Makefile
index 0e17e1e4..9d0c3d23 100644
--- a/Makefile
+++ b/Makefile
@@ -6,45 +6,63 @@ 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)
 
-all: prosody.install prosody.cfg.lua.install util/encodings.so util/hashes.so
+.PHONY: all clean install
 
-install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so
-	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
+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 ./prosody.install $(BIN)/prosody
+	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
 
 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
-
-util/hashes.so:
+util/%.so:
 	$(MAKE) install -C util-src
 
-prosody.install: prosody
+%.install: %
 	sed "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 > prosody.install
+		s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@
 
-prosody.cfg.lua.install:
-	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
+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 \
+		> $@
+	test -f prosody.release && cp prosody.release $@ || true