Commit 3cec7121 authored by Michael Soegtrop's avatar Michael Soegtrop Committed by Guillaume Melquiond

Improve configuration step on Windows.

parent 04d859ea
......@@ -43,7 +43,7 @@ configure config.status: configure.in
@COQC@ -R src Gappa -I src $<
COQSUBTREES = clib engine kernel interp intf lib library ltac parsing pretyping printing proofs tactics toplevel vernac plugins/ltac
COQINCLUDES = $(addprefix -I @COQLIB@/, $(COQSUBTREES))
COQINCLUDES = $(addprefix -I "@COQLIB@"/, $(COQSUBTREES))
src/gappatac.cmo: src/gappatac.ml
@OCAMLC@ -pp "@CAMLP4O@ pa_macro.cmo -D@COQDEFINE@" -rectypes $(COQINCLUDES) -c $< -o $@
......
......@@ -53,7 +53,17 @@ if test ! "$CAMLP4O"; then
if test ! "$CAMLP4O"; then
CAMLP4O=camlp5o
fi
CAMLP4O=`which $CAMLP4O`
case `uname -s` in
CYGWIN*)
case "$CAMLP4O" in
*:*) CAMLP4O=`cygpath -m "$CAMLP4O"` ;;
*) CAMLP4O=`cygpath -u "$CAMLP4O"` ;;
esac
;;
*)
CAMLP4O=`which $CAMLP4O`
;;
esac
fi
AC_MSG_RESULT([$CAMLP4O])
......@@ -81,10 +91,10 @@ AS_IF(
rm -f conftest.v conftest.vo conftest.err
AC_SUBST(OCAMLLIB)
OCAMLLIB=`$OCAMLC -where`
OCAMLLIB=`$OCAMLC -where | tr -d '\r' | tr '\\\\' '/'`
AC_SUBST(COQLIB)
COQLIB=`$COQC -where`
COQLIB=`$COQC -where | tr -d '\r' | tr '\\\\' '/'`
if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$COQLIB/user-contrib/Gappa"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment