Olaf Hering
d100d918d2
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/planets?expand=0&rev=8
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
Description: Remove -custom build flag, replace -g with variable $(DEBUGFLAGS)
|
|
|
|
---
|
|
Makefile | 10 +++++-----
|
|
saveState.ml | 2 +-
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -11,16 +11,16 @@
|
|
PREFIX=/usr/local
|
|
endif
|
|
|
|
-INCLUDES=-I +labltk
|
|
+INCLUDES=-I +unix -I +camlp-streams -I +labltk
|
|
CAMLP4=-pp $(CAMLP4O)
|
|
OCAMLDEP=ocamldep
|
|
-CAMLLIBS=unix.cma str.cma labltk.cma # libjpf.cma mylibs.cma
|
|
-OCAMLFLAGS=$(INCLUDES) $(CAMLP4) -g -custom $(CAMLLIBS) -cclib -lunix
|
|
-OCAMLOPTFLAGS=$(INCLUDES) $(CAMLP4) $(CAMLLIBS:.cma=.cmxa) -inline 50 -cclib -lunix
|
|
+CAMLLIBS=unix.cma camlp_streams.cma str.cma labltk.cma # libjpf.cma mylibs.cma
|
|
+OCAMLFLAGS=$(INCLUDES) $(CAMLP4) $(DEBUGFLAGS) $(CAMLLIBS)
|
|
+OCAMLOPTFLAGS=$(INCLUDES) $(CAMLP4) $(CAMLLIBS:.cma=.cmxa) -inline 50
|
|
|
|
ifdef PROFILING
|
|
OCAMLC=ocamlcp
|
|
- OCAMLOPTFLAGS = -p $(INCLUDES) $(CAMLLIBS:.cma=.cmxa) -inline 40 -cclib -lunix
|
|
+ OCAMLOPTFLAGS = -p $(INCLUDES) $(CAMLLIBS:.cma=.cmxa) -inline 40
|
|
endif
|
|
|
|
OBJS = augSet.cmx augMap.cmx mTimer.cmx common.cmx lstrings.cmx options.cmx \
|
|
--- a/saveState.ml
|
|
+++ b/saveState.ml
|
|
@@ -185,7 +185,7 @@
|
|
try
|
|
let home = Sys.getenv "HOME" in
|
|
let pdir = Filename.concat home ".planets" in
|
|
- if Sys.file_exists pdir & is_dir pdir
|
|
+ if Sys.file_exists pdir && is_dir pdir
|
|
then pdir
|
|
else
|
|
(* PROBLEM: is 0x1FF really the right mode? *)
|