From 203c5b4d85329a3420bc76f71c921731ca28a60a Mon Sep 17 00:00:00 2001 From: Thijs Alkemade Date: Fri, 2 Mar 2012 19:56:10 +0100 Subject: Fix make install for mod_s2s. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0fa8b28e..d94cdf56 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -d $(SOURCE)/util/sasl install -m644 util/sasl/* $(SOURCE)/util/sasl install -m644 plugins/*.lua $(MODULES) + install -m644 plugins/s2s/*.lua $(MODULES) install -d $(MODULES)/muc install -m644 plugins/muc/* $(MODULES)/muc install -m644 certs/* $(CONFIG)/certs -- cgit v1.2.3 From 326b9c2cc29490fec4e2f2719b98e8e6530014c9 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 20 Mar 2012 12:50:53 +0100 Subject: Makefile: Use cp instead of install, and make sure the correct umask is set --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d94cdf56..356563f2 100644 --- a/Makefile +++ b/Makefile @@ -32,13 +32,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -m644 util/*.so $(SOURCE)/util install -d $(SOURCE)/util/sasl install -m644 util/sasl/* $(SOURCE)/util/sasl - install -m644 plugins/*.lua $(MODULES) - install -m644 plugins/s2s/*.lua $(MODULES) - install -d $(MODULES)/muc - install -m644 plugins/muc/* $(MODULES)/muc + umask 0022 && cp -r plugins/* $(MODULES) 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 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 -- cgit v1.2.3