# HG changeset patch # User Matthew Wild # Date 1228075102 0 # Node ID 03d7da01843ed1919907e86f3779a51c438d182c # Parent cadc9d6db7d888bbc96d1e66bc9b0bec26f9e3a8 Change sed usage back into one sed script for incompetent versions of sed diff -r cadc9d6db7d8 -r 03d7da01843e Makefile --- a/Makefile Sun Nov 30 19:36:30 2008 +0000 +++ b/Makefile Sun Nov 30 19:58:22 2008 +0000 @@ -40,12 +40,10 @@ $(MAKE) install -C util-src prosody.install: prosody - cp prosody prosody.install - sed -i "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;" prosody.install - sed -i "s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" prosody.install - sed -i "s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|;" prosody.install - # The trailing slash is intentional in this one - sed -i "s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody.install + sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ + s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ + s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ + s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install prosody.cfg.lua.install: sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install