diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-03 15:09:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-03 15:09:58 +0000 |
| commit | e9c064e355fee23eca94878748b4b182d1d625ac (patch) | |
| tree | 7b6d2c0f1590858ca3eaed80de5758c64b9ee328 /Makefile | |
| parent | f1a9c23909b5472f68a9d81c858d267c48a9405e (diff) | |
| parent | 1c20002637bbd2c9cfaa951acd74ed95a0217e99 (diff) | |
| download | prosody-e9c064e355fee23eca94878748b4b182d1d625ac.tar.gz prosody-e9c064e355fee23eca94878748b4b182d1d625ac.zip | |
Merge from waqas
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -12,8 +12,7 @@ INSTALLEDCONFIG = $(SYSCONFDIR) INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules INSTALLEDDATA = $(DATADIR) -all: prosody.install prosody.cfg.lua.install - $(MAKE) all -C util-src +all: prosody.install prosody.cfg.lua.install util/encodings.so util/hashes.so install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) $(DATA) @@ -41,12 +40,10 @@ util/hashes.so: $(MAKE) install -C util-src prosody.install: prosody - cp prosody prosody.install - sed -i "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;" prosody.install - sed -i "s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;" prosody.install - sed -i "s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|;" prosody.install - # The trailing slash is intentional in this one - sed -i "s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody.install + sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \ + s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \ + s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \ + s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install prosody.cfg.lua.install: sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install |