diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1996-02-20 11:01:20 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1996-02-20 11:01:20 +0000 |
| commit | ec7b415e4010e2a6bad7290cfa7e69e1b55d93e2 (patch) | |
| tree | 799d961c206fb2972553ae601a8f9a4702f7edae | |
| parent | 66f7f8c6f875fe321f9685058970e0263a07547f (diff) | |
Makefile: variable CPPFLAGS pour pouvoir faire des compilos croises.
filename.mlp: typo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@648 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | stdlib/Makefile | 3 | ||||
| -rw-r--r-- | stdlib/filename.mlp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index 5b7fd5c9e..c9a97320d 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -6,6 +6,7 @@ CAMLC=$(RUNTIME) $(COMPILER) OPTCOMPILER=../cslopt CAMLOPT=$(RUNTIME) $(OPTCOMPILER) CAMLDEP=../boot/cslrun ../tools/csldep +CPPFLAGS=-DUNIX OBJS=pervasives.cmo list.cmo string.cmo char.cmo array.cmo sys.cmo \ hashtbl.cmo sort.cmo filename.cmo obj.cmo lexing.cmo parsing.cmo \ @@ -50,7 +51,7 @@ pervasives.cmx: pervasives.ml filename.ml: filename.mlp ../config/Makefile @rm -f filename.ml - $(CPP) -DUNIX filename.mlp > filename.ml || \ + $(CPP) $(CPPFLAGS) filename.mlp > filename.ml || \ { rm -f filename.ml; exit 2; } @chmod -w filename.ml diff --git a/stdlib/filename.mlp b/stdlib/filename.mlp index 7a364c1bd..646e7b32e 100644 --- a/stdlib/filename.mlp +++ b/stdlib/filename.mlp @@ -110,7 +110,7 @@ let rindexsep s = let basename name = try - let p = rindexsep + 1 in + let p = rindexsep name + 1 in String.sub name p (String.length name - p) with Not_found -> name |