Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cygwin build patch by Davide marques

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@1365 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
commit 8054c714e0added82524a7082f48978d2d5e3da5 1 parent 3f6194f
@klacke authored
View
13 configure
@@ -1933,8 +1933,7 @@ echo "${ECHO_T}no" >&6; }
fi
-ERLBINDIR=`dirname $ERL` ; ERLBINDIR=`dirname $ERLBINDIR`/lib/erlang/bin
-
+ERLBINDIR=`dirname "$ERL"` ; ERLBINDIR=`dirname "$ERLBINDIR"`/lib/erlang/bin
@@ -2016,7 +2015,7 @@ echo $ECHO_N "checking erts version... $ECHO_C" >&6; }
if test "${bt_cv_erts_vsn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- bt_cv_erts_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ bt_cv_erts_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^erts-/ { if ($2 > v) v=$2; }
END { print v; }'`"
case "$bt_cv_erts_vsn" in
@@ -2040,7 +2039,7 @@ echo $ECHO_N "checking kernel version... $ECHO_C" >&6; }
if test "${bt_cv_kernel_vsn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- bt_cv_kernel_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ bt_cv_kernel_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^kernel-/ { if ($2 > v) v=$2; }
END { print v; }'`"
case "$bt_cv_kernel_vsn" in
@@ -2064,7 +2063,7 @@ echo $ECHO_N "checking stdlib version... $ECHO_C" >&6; }
if test "${bt_cv_stdlib_vsn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- bt_cv_stdlib_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ bt_cv_stdlib_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^stdlib-/ { if ($2 > v) v=$2; }
END { print v; }'`"
case "$bt_cv_stdlib_vsn" in
@@ -2088,7 +2087,7 @@ echo $ECHO_N "checking sasl version... $ECHO_C" >&6; }
if test "${bt_cv_sasl_vsn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- bt_cv_sasl_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ bt_cv_sasl_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^sasl-/ { if ($2 > v) v=$2; }
END { print v; }'`"
case "$bt_cv_sasl_vsn" in
@@ -2112,7 +2111,7 @@ echo $ECHO_N "checking mnesia version... $ECHO_C" >&6; }
if test "${bt_cv_mnesia_vsn+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- bt_cv_mnesia_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ bt_cv_mnesia_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^mnesia-/ { if ($2 > v) v=$2; }
END { print v; }'`"
case "$bt_cv_mnesia_vsn" in
View
4 configure.in
@@ -10,7 +10,7 @@ AC_DEFINE_UNQUOTED(CPU_VENDOR_OS, "$target")
AC_PATH_PROG(ERL, erl)
AC_PATH_PROG(ERLC, erlc)
-ERLBINDIR=`dirname $ERL` ; ERLBINDIR=`dirname $ERLBINDIR`/lib/erlang/bin
+ERLBINDIR=`dirname "$ERL"` ; ERLBINDIR=`dirname "$ERLBINDIR"`/lib/erlang/bin
AC_SUBST(ERL)
AC_SUBST(ERLC)
@@ -60,7 +60,7 @@ AC_DEFUN(BT_ERL_LIB_VSN,
[
AC_MSG_CHECKING([$1 version])
AC_CACHE_VAL(bt_cv_$1_vsn,
- [bt_cv_$1_vsn="`ls ${ERLDIR} ${ERLDIR}/lib | \
+ [bt_cv_$1_vsn="`ls \"${ERLDIR}\" \"${ERLDIR}/lib\" | \
awk -F- '/^$1-/ { if ([$]2 > v) v=[$]2; }
END { print v; }'`"
case "$bt_cv_$1_vsn" in
View
4 include.mk.in
@@ -95,10 +95,10 @@ APPSCRIPT = '$$vsn=shift; $$mods=""; while(@ARGV){ $$_=shift; s/^([A-Z].*)$$/\'\
cp $< $@
../ebin/%.$(EMULATOR): %.erl
- "$(ERLC)" $(ERLC_FLAGS) -o ../ebin $<
+ $(ERLC) $(ERLC_FLAGS) -o ../ebin $<
%.$(EMULATOR): %.erl
- "$(ERLC)" $(ERLC_FLAGS) $<
+ $(ERLC) $(ERLC_FLAGS) $<
View
18 scripts/Makefile
@@ -5,8 +5,8 @@ all debug: ../bin/yaws yaws.conf
../bin/yaws: yaws.template
cat yaws.template | \
- ./Subst %yawsdir% `pwd`/.. | \
- ./Subst %vardir% $(VARDIR) | \
+ ./Subst %yawsdir% "`pwd`/.." | \
+ ./Subst %vardir% "$(VARDIR)" | \
./Subst %run_erl% "$(ERLBINDIR)/run_erl" | \
./Subst %to_erl% "$(ERLBINDIR)/to_erl" | \
./Subst %erl% $(ERL) | \
@@ -23,11 +23,11 @@ local_install: ../bin/yaws
fi; \
echo "--- Installing local config file at $${target} "; \
cat yaws.conf.template | \
- ./Subst %yawsdir% `pwd`/.. | \
+ ./Subst %yawsdir% "`pwd`/.." | \
./Subst %logdir% $$HOME/yaws_logs | \
./Subst %host% `hostname` | \
./Subst %port% 8000 | \
- ./Subst %vardir% $(VARDIR) | \
+ ./Subst %vardir% "$(VARDIR)" | \
./Subst %docroot% `pwd`/../www | \
./Subst %certdir% `pwd`/../ssl | \
./Subst %sslport% 4443 > $${target}; \
@@ -40,13 +40,13 @@ local_install: ../bin/yaws
yaws.conf:
@echo PREFIX is $(PREFIX)
cat yaws.conf.template | \
- ./Subst %yawsdir% $(PREFIX)/lib/yaws | \
- ./Subst %logdir% $(VARDIR)/log/yaws | \
- ./Subst %vardir% $(VARDIR) | \
+ ./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
+ ./Subst %logdir% "$(VARDIR)/log/yaws" | \
+ ./Subst %vardir% "$(VARDIR)" | \
./Subst %host% `hostname` | \
./Subst %port% 80 | \
- ./Subst %docroot% $(VARDIR)/yaws/www | \
- ./Subst %certdir% $(ETCDIR) | \
+ ./Subst %docroot% "$(VARDIR)/yaws/www" | \
+ ./Subst %certdir% "$(ETCDIR)" | \
./Subst %sslport% 443 > yaws.conf
clean:
View
4 scripts/Subst
@@ -3,8 +3,8 @@
p=$1
-if [ x`uname -a | fgrep Cygwin` != x ]; then
- d=`cygpath -m $2`
+if [ `uname -a | fgrep -c Cygwin` != 0 ]; then
+ d=`cygpath -m "$2"`
else
d=$2
fi
Please sign in to comment.
Something went wrong with that request. Please try again.