aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
commit7271c148cef981f9263a8794ebe27634423b07bd (patch)
tree837729c161f9e2d3d65a08790d25bebb37e622e1 /Makefile
parent5b8969b8d9a926294b0f09b3f835ae994d58d012 (diff)
downloadprosody-7271c148cef981f9263a8794ebe27634423b07bd.tar.gz
prosody-7271c148cef981f9263a8794ebe27634423b07bd.zip
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f1c1a286..0a96d2e5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,10 @@ SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
all:
$(MAKE) all -C util-src
-install: prosody util/encodings.so util/encodings.so
-
+install: prosody.install util/encodings.so util/encodings.so
install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
- install ./prosody $(BIN)
+ install ./prosody.install $(BIN)/prosody
install -m644 core/* $(SOURCE)/core
install -m644 net/* $(SOURCE)/net
install -m644 util/* $(SOURCE)/util
@@ -22,6 +21,7 @@ install: prosody util/encodings.so util/encodings.so
$(MAKE) install -C util-src
clean:
+ rm -f prosody.install
$(MAKE) clean -C util-src
util/encodings.so:
@@ -29,3 +29,7 @@ util/encodings.so:
util/hashes.so:
$(MAKE) install -C util-src
+
+prosody.install: prosody
+ sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(SOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(CONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(MODULES)/';|;" prosody > prosody.install
+