diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
commit | 97bac9bd826969c524c81709b7ded19fc058323d (patch) | |
tree | 861eaefae2bd906eace48b17e5f6172dca6c8f5c /Makefile | |
parent | a479cb0e199235e6ba72de332f3994551cfa2cbb (diff) | |
parent | da820882348572de470a13a1a50f529a51243aa5 (diff) | |
download | prosody-97bac9bd826969c524c81709b7ded19fc058323d.tar.gz prosody-97bac9bd826969c524c81709b7ded19fc058323d.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -55,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)';|; \ |