Change sed usage back into one sed script for incompetent versions of sed
authorMatthew Wild <mwild1@gmail.com>
Sun, 30 Nov 2008 19:58:22 +0000 (19:58 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 30 Nov 2008 19:58:22 +0000 (19:58 +0000)
Makefile

index 53f81dd42ce33934de8badb9b3a33d495b17a9ca..0e17e1e4d603e054249af6018159d59a792902ad 100644 (file)
--- 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