aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2002-01-10 18:20:33 +0000
committerGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2002-01-10 18:20:33 +0000
commitd8ebce5003c8eabffe6a615128d9cf9f29d3c570 (patch)
treed341c09524b35f1f271b00584a4c1dbc0f130b17 /config
parentf366321500d0b1f4597f8d870c112336375146ee (diff)
MAJ ocaml 3.04 sur Windows
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2387 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.template27
1 files changed, 4 insertions, 23 deletions
diff --git a/config/Makefile.template b/config/Makefile.template
index 62dae6b80..407d17012 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -34,16 +34,12 @@ EMACS=EMACSCOMMAND
COQTOP=COQTOPDIRECTORY
VERSION=COQVERSION
-# Path to the directory containing the objective-caml commands
-# Used in src/launch
-CAMLBIN=CAMLBINDIRECTORY
-
# Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
CAMLP4BIN=CAMLP4BINDIRECTORY
-# Camlp4 library directory
+# Camlp4 library directory (avoid CAMLP4LIB used on Windows)
CAMLP4O=CAMLP4TOOL
-CAMLP4LIB=CAMLP4LIBDIRECTORY
+MYCAMLP4LIB=CAMLP4LIBDIRECTORY
# Objective-Caml compile command
OCAMLC=BYTECAMLC
@@ -74,24 +70,9 @@ ARCH=ARCHITECTURE
# Supplementary libs for some systems, currently:
# . Sun Solaris: -cclib -lunix -cclib -lnsl -cclib -lsocket
# . others : -cclib -lunix
-# . windows : -cclib \\ocaml\lib\libunix.lib -cclib wsock32.lib
-
-OSDEPLIBS=OSDEPENDANTLIBS
-
-# Supplementary camlp4 flags for some systems, currently:
-# . ppp : -split_gext
-
-OSDEPP4OPTFLAGS=OSDEPENDANTP4OPTFLAGS
-
-# the caml str lib
-# Unix : -cclib -lstr
-# Windows : -cclib \\ocaml/lib/libstr.lib
-WITH_STR=STRLIBRARY
+# . windows : -cclib -lunix
-# OStype is one of :
-# Unix
-# Win32
-OSTYPE=OSKIND
+OSDEPLIBS=OSDEPENDENTLIBS
# executable files extension, currently:
# Unix systems: