mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 21:27:38 +03:00
configure, Makefile: Allow runtime to be overridden.
This commit is contained in:
parent
5db9a6c120
commit
2b1cd1a3ae
2 changed files with 7 additions and 1 deletions
3
Makefile
3
Makefile
|
@ -52,7 +52,8 @@ util/%.so:
|
|||
$(MAKE) install -C util-src
|
||||
|
||||
%.install: %
|
||||
sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
|
||||
sed "1s/\blua\b/$(RUNWITH)/; \
|
||||
s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
|
||||
s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
|
||||
s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
|
||||
s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@
|
||||
|
|
5
configure
vendored
5
configure
vendored
|
@ -16,6 +16,7 @@ OPENSSL_LIB=crypto
|
|||
CC=gcc
|
||||
CXX=g++
|
||||
LD=gcc
|
||||
RUNWITH=lua
|
||||
|
||||
CFLAGS="-fPIC -Wall"
|
||||
LDFLAGS="-shared"
|
||||
|
@ -171,6 +172,9 @@ do
|
|||
--linker=*)
|
||||
LD="$value"
|
||||
;;
|
||||
--runwith=*)
|
||||
RUNWITH="$value"
|
||||
;;
|
||||
*)
|
||||
echo "Error: Unknown flag: $1"
|
||||
exit 1
|
||||
|
@ -341,6 +345,7 @@ LDFLAGS=$LDFLAGS
|
|||
CC=$CC
|
||||
CXX=$CXX
|
||||
LD=$LD
|
||||
RUNWITH=$RUNWITH
|
||||
|
||||
EOF
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue