Software / code / prosody
Changeset
481:29f974ef00a7
More Makefile improvements (install the certificates, and update the config on install to find them)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 29 Nov 2008 17:52:10 +0000 |
| parents | 480:5d00d623904e |
| children | 483:ba4d8e051b95 |
| files | Makefile |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Nov 29 17:22:05 2008 +0000 +++ b/Makefile Sat Nov 29 17:52:10 2008 +0000 @@ -14,19 +14,23 @@ 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 @@ 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 +
