Comparison

Makefile @ 6581:f2a7ad099e01

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Feb 2015 15:22:34 +0000
parent 6576:b7796a46aec2
child 6810:533fd843d91f
comparison
equal deleted inserted replaced
6573:afd638e9c6d0 6581:f2a7ad099e01
1 1
2 include config.unix 2 include config.unix
3 3
4 BIN = $(DESTDIR)$(PREFIX)/bin 4 BIN = $(DESTDIR)$(PREFIX)/bin
5 CONFIG = $(DESTDIR)$(SYSCONFDIR) 5 CONFIG = $(DESTDIR)$(SYSCONFDIR)
6 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules 6 MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
7 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody 7 SOURCE = $(DESTDIR)$(LIBDIR)/prosody
8 DATA = $(DESTDIR)$(DATADIR) 8 DATA = $(DESTDIR)$(DATADIR)
9 MAN = $(DESTDIR)$(PREFIX)/share/man 9 MAN = $(DESTDIR)$(PREFIX)/share/man
10 10
11 INSTALLEDSOURCE = $(PREFIX)/lib/prosody 11 INSTALLEDSOURCE = $(LIBDIR)/prosody
12 INSTALLEDCONFIG = $(SYSCONFDIR) 12 INSTALLEDCONFIG = $(SYSCONFDIR)
13 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules 13 INSTALLEDMODULES = $(LIBDIR)/prosody/modules
14 INSTALLEDDATA = $(DATADIR) 14 INSTALLEDDATA = $(DATADIR)
15 15
16 .PHONY: all clean install 16 .PHONY: all clean install
17 17
18 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version 18 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version