# HG changeset patch # User Matthew Wild # Date 1227997691 0 # Node ID 279f64370885f8c5a3d71bbb28e0a5d95e03cf76 # Parent 25042b0d262653f6cc8abd923c46eec35c5fdd83 Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :( diff -r 25042b0d2626 -r 279f64370885 Makefile --- a/Makefile Sat Nov 29 22:20:59 2008 +0000 +++ b/Makefile Sat Nov 29 22:28:11 2008 +0000 @@ -25,12 +25,12 @@ install -m644 plugins/* $(MODULES) install -m644 certs/* $(CONFIG)/certs install -m644 plugins/* $(MODULES) - install -m644 prosody.cfg.lua $(CONFIG)/prosody.cfg.lua + install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua $(MAKE) install -C util-src clean: rm -f prosody.install - rm -f prosody.cfg.lua + rm -f prosody.cfg.lua.install $(MAKE) clean -C util-src util/encodings.so: @@ -43,5 +43,5 @@ sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody > prosody.install prosody.cfg.lua: - sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua + sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install