diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-30 17:18:31 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-30 17:18:31 +0100 |
| commit | e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b (patch) | |
| tree | 7f7e46548c10d40a1843c13580c827725fc47aa1 /Makefile | |
| parent | 81ff9d3a9fbaff5893deeacc854c25b61d3f6106 (diff) | |
| parent | 8932fbc85ca4a43bba31099569bb579c6a803f22 (diff) | |
| download | prosody-e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b.tar.gz prosody-e18e2e4b2dd9febe59224ea9a58e0ee1cbbbb80b.zip | |
Automerge with waqas.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -5,8 +5,7 @@ BIN = $(DESTDIR)$(PREFIX)/bin 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 @@ all: prosody.install prosody.cfg.lua.install $(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 |