File planets-0.1.13-buildflags.patch of Package planets
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? *)