From: Matthew Wild Date: Sun, 30 Nov 2008 19:58:22 +0000 (+0000) Subject: Change sed usage back into one sed script for incompetent versions of sed X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e0c9712a17ea5ae2c744732f3804877626ffe07f;p=prosody.git Change sed usage back into one sed script for incompetent versions of sed --- diff --git a/Makefile b/Makefile index 53f81dd4..0e17e1e4 100644 --- a/Makefile +++ b/Makefile @@ -40,12 +40,10 @@ util/hashes.so: $(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