aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 22:28:11 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 22:28:11 +0000
commitb45c3b642407cd5606826a866880532d8dc0a36b (patch)
tree91f17b4b5dc8ad4c9e5e2b19561492bb903f8ff4 /Makefile
parente6c50bbe6575b68fd443131a606f07758933dbeb (diff)
downloadprosody-b45c3b642407cd5606826a866880532d8dc0a36b.tar.gz
prosody-b45c3b642407cd5606826a866880532d8dc0a36b.zip
Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :(
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9fca034c..4f028abe 100644
--- a/Makefile
+++ b/Makefile
@@ -25,12 +25,12 @@ install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
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 @@ prosody.install: prosody
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