X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=Makefile;h=85eca971f6f46faf26cabdc408937f4295e2353c;hb=1ebc03c62252c2fa1e2c431465ed3e9b46bf3c51;hp=c5390599064405960c303b55f095f2c51fa02b41;hpb=fe8d600283bd9866566d3abe313a6b5e983fe7ae;p=prosody.git diff --git a/Makefile b/Makefile index c5390599..85eca971 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,9 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -m755 ./prosodyctl.install $(BIN)/prosodyctl install -m644 core/* $(SOURCE)/core install -m644 net/*.lua $(SOURCE)/net - install -d $(SOURCE)/net/http + 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 @@ -55,7 +56,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)';|; \