From d00f8a6cf6ea02592322bcb0cde0da06da4b4ead Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 29 Nov 2008 17:22:05 +0000
Subject: Update Makefile to set correct paths on install with Debian package

---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0a96d2e5..2bebb836 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,11 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 
+INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDCONFIG = $(SYSCONFDIR)
+INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+
+
 all:
 	$(MAKE) all -C util-src
 
@@ -31,5 +36,5 @@ 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
+	sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody > prosody.install
 
-- 
cgit v1.2.3


From 10463d1bb73dc74d69f2584beb6316e171cb4dbf Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 29 Nov 2008 17:52:10 +0000
Subject: More Makefile improvements (install the certificates, and update the
 config on install to find them)

---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2bebb836..9fca034c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,19 +14,23 @@ INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
 all:
 	$(MAKE) all -C util-src
 
-install: prosody.install util/encodings.so util/encodings.so
+install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
 	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install ./prosody.install $(BIN)/prosody
 	install -m644 core/* $(SOURCE)/core
 	install -m644 net/* $(SOURCE)/net
 	install -m644 util/* $(SOURCE)/util
 	install -m644 plugins/* $(MODULES)
-	install -m644 prosody.cfg.lua.dist $(CONFIG)/prosody.cfg.lua
+	install -m644 certs/* $(CONFIG)/certs
+	install -m644 plugins/* $(MODULES)
+	install -m644 prosody.cfg.lua $(CONFIG)/prosody.cfg.lua
 	$(MAKE) install -C util-src
 
 clean:
 	rm -f prosody.install
+	rm -f prosody.cfg.lua
 	$(MAKE) clean -C util-src
 
 util/encodings.so:
@@ -38,3 +42,6 @@ util/hashes.so:
 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
+
-- 
cgit v1.2.3