projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26e8671
)
configure, Makefile: Make compatible with plain Bourne shell as used on Solaris....
author
Matthew Wild
<mwild1@gmail.com>
Wed, 2 Sep 2015 17:54:34 +0000
(18:54 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Wed, 2 Sep 2015 17:54:34 +0000
(18:54 +0100)
Makefile
patch
|
blob
|
history
configure
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index f6e1e3f2deb1bff4eb6b5cc2937f6cd375c85eb9..492d7ea5fd2b3f14c3d4ab798538f50ea70814c6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-41,8
+41,8
@@
install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
umask 0022 && cp -r plugins/* $(MODULES)
install -m644 certs/* $(CONFIG)/certs
install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
umask 0022 && cp -r plugins/* $(MODULES)
install -m644 certs/* $(CONFIG)/certs
install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
- test -
e
$(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
- test -
e
prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
+ test -
f
$(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+ test -
f
prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
$(MAKE) install -C util-src
clean:
$(MAKE) install -C util-src
clean:
@@
-66,7
+66,7
@@
prosody.cfg.lua.install: prosody.cfg.lua.dist
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
prosody.version: $(wildcard prosody.release .hg/dirstate)
- test -
e
.hg/dirstate && \
+ test -
d
.hg/dirstate && \
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
test -f prosody.release && \
cp prosody.release $@ || true
hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
test -f prosody.release && \
cp prosody.release $@ || true
diff --git
a/configure
b/configure
index 37f45f9b1efd231060c98351cc09d0807cf17064..53ee375775b78f715aa385ff1f3b2a5735d93bc4 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-227,7
+227,7
@@
find_program() {
found="no"
while [ "$item" ]
do
found="no"
while [ "$item" ]
do
- if [ -
e
"$item/$1" ]
+ if [ -
f
"$item/$1" ]
then
found="yes"
break
then
found="yes"
break
@@
-250,7
+250,7
@@
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
LUA_SUFFIX="$suffix"
if [ "$LUA_DIR_SET" = "yes" ]
then
- if [ -
e
"$LUA_DIR/bin/lua$suffix" ]
+ if [ -
f
"$LUA_DIR/bin/lua$suffix" ]
then
find_lua="$LUA_DIR"
fi
then
find_lua="$LUA_DIR"
fi
@@
-265,7
+265,7
@@
then
done
fi
done
fi
-if
! [ "$LUA_DIR_SET"
= "yes" ]
+if
[ "$LUA_DIR_SET" !
= "yes" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
then
echo -n "Looking for Lua... "
if [ ! "$find_lua" ]
@@
-284,12
+284,12
@@
then
fi
fi
fi
fi
-if
! [ "$LUA_INCDIR_SET"
= "yes" ]
+if
[ "$LUA_INCDIR_SET" !
= "yes" ]
then
LUA_INCDIR="$LUA_DIR/include"
fi
then
LUA_INCDIR="$LUA_DIR/include"
fi
-if
! [ "$LUA_LIBDIR_SET"
= "yes" ]
+if
[ "$LUA_LIBDIR_SET" !
= "yes" ]
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
then
LUA_LIBDIR="$LUA_DIR/lib"
fi
@@
-311,7
+311,7
@@
fi
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
echo -n "Checking Lua includes... "
lua_h="$LUA_INCDIR/lua.h"
-if [ -
e
"$lua_h" ]
+if [ -
f
"$lua_h" ]
then
echo "lua.h found in $lua_h"
else
then
echo "lua.h found in $lua_h"
else