Makefile fix for creating datadir in correct place on install

Sun, 30 Nov 2008 14:30:22 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Sun, 30 Nov 2008 14:30:22 +0000
changeset 503
00702b66beb1
parent 502
21dc299387a6
child 504
efc5184effa1

Makefile fix for creating datadir in correct place on install

Makefile file | annotate | diff | comparison | revisions
--- a/Makefile	Sun Nov 30 04:22:43 2008 +0000
+++ b/Makefile	Sun Nov 30 14:30:22 2008 +0000
@@ -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

mercurial