Diff

Makefile @ 507:4d3ccc6b5817

Automerge with waqas.
author Tobias Markmann <tm@ayena.de>
date Sun, 30 Nov 2008 17:18:31 +0100
parent 503:00702b66beb1
child 512:eb50ee09c2bb
line wrap: on
line diff
--- a/Makefile	Sun Nov 30 15:18:45 2008 +0100
+++ b/Makefile	Sun Nov 30 17:18:31 2008 +0100
@@ -5,8 +5,7 @@
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
-
-DATADIR?=data
+DATA = $(DESTDIR)$(DATADIR)
 
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
@@ -17,7 +16,7 @@
 	$(MAKE) all -C util-src
 
 install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so
-	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATADIR)
+	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA)
 	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install ./prosody.install $(BIN)/prosody