Automated merge with h-h.

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 9fca034cd8d82c14c8d3235961703fa3ada433af..6676fc5bfcac0321b196f05b9130a904a4b27836 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,18 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 
+DATADIR?=data
+
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDDATA = $(DATADIR)
 
-
-all:
+all: prosody.install prosody.cfg.lua.install
        $(MAKE) all -C util-src
 
-install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
-       install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so
+       install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATADIR)
        install -d $(CONFIG)/certs
        install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
        install ./prosody.install $(BIN)/prosody
@@ -25,12 +27,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
+       test -e $(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:
@@ -40,8 +42,13 @@ util/hashes.so:
        $(MAKE) install -C util-src
 
 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
+       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
+
+prosody.cfg.lua.install:
+       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install