X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=Makefile;h=0e69192aecf6a4abbc608a2814164a0ea500bf4d;hb=65a4f985dd63b1a4d84305d7bc27506aeb8495b2;hp=356563f22c6c8afcd75cc7da0605ce65a6879bb8;hpb=3b635da220bdbe28712f7007be430eb6e1283912;p=prosody.git

diff --git a/Makefile b/Makefile
index 356563f2..0e69192a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,9 @@ 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 -m644 net/* $(SOURCE)/net
+	install -m644 net/*.lua $(SOURCE)/net
+	install -d $(SOURCE)/net/http
+	install -m644 net/http/*.lua $(SOURCE)/net/http
 	install -m644 util/*.lua $(SOURCE)/util
 	install -m644 util/*.so $(SOURCE)/util
 	install -d $(SOURCE)/util/sasl
@@ -50,7 +52,8 @@ util/%.so:
 	$(MAKE) install -C util-src
 
 %.install: %
-	sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+	sed "1s/\blua\b/$(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)/';|;" < $^ > $@