mod_privacy: Fix selecting the top resource (fixes #694)

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index b96b6732cda003320a38162cbf164ed5b3f8ee28..46a8f49da10a9c877c82b1325fb4c330d0519a22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,23 @@ 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
 
 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)
@@ -26,7 +29,7 @@ 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 -m644 net/http/*.lua $(SOURCE)/net/http
@@ -52,7 +55,7 @@ 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)';|; \