[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.1.0-1-12-gf0765b5

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0d62126f826023e9c6ca200405286e88165e5c3d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Mar 13 15:19:24 2009 +0100

    Force -custom when linking ocsigen
    
    Fixes FTBFS. Compiling without -custom requires some changes in
    upstream build system, which have already been done upstream and will
    be available in the next upstream release.

diff --git a/server/Makefile b/server/Makefile
index 4e8db2f..752ea77 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -104,7 +104,7 @@ opt: $(OBJSOPT) $(OBJSEXEOPT) $(NAME).opt
 .PHONY: doc depend
 
 $(NAME): $(CMAO) $(OBJSEXE)
-	$(CAMLC) -o $(NAME) -linkpkg -linkall $(CMAOCAMLP4) $(CMAO) $(OBJSEXE)
+	$(CAMLC) -o $(NAME) -custom -linkpkg -linkall $(CMAOCAMLP4) $(CMAO) $(OBJSEXE)
 
 $(NAME).opt: $(CMXXA) $(OBJSEXEOPT)
 	$(CAMLOPT) -o $(NAME).opt -linkpkg -linkall $(CMXXACAMLP4) $(CMXXA) $(OBJSEXEOPT)

-- 
ocsigen packaging