[Pkg-ocaml-maint-commits] r1232 - trunk/packages/demexp/debian/patches

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-04-09 18:24:51 +0000 (Sat, 09 Apr 2005)
New Revision: 1232

Modified:
   trunk/packages/demexp/debian/patches/makefile.dpatch
Log:
Makefile.dpatch now allows to compile correctly. More cleanup to come

Modified: trunk/packages/demexp/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/demexp/debian/patches/makefile.dpatch	2005-04-09 17:44:02 UTC (rev 1231)
+++ trunk/packages/demexp/debian/patches/makefile.dpatch	2005-04-09 18:24:51 UTC (rev 1232)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad demexp-0.4/Makefile /tmp/dpep.S9ffqA/demexp-0.4/Makefile
+diff -urNad demexp-0.4/Makefile /tmp/dpep.KyIi3R/demexp-0.4/Makefile
 --- demexp-0.4/Makefile	2005-03-15 18:50:27.000000000 +0100
-+++ /tmp/dpep.S9ffqA/demexp-0.4/Makefile	2005-04-09 19:36:47.645770022 +0200
++++ /tmp/dpep.KyIi3R/demexp-0.4/Makefile	2005-04-09 20:22:10.155278901 +0200
 @@ -7,6 +7,8 @@
  .PHONY: all
  all: bin bin.bc static test test.bc xml doc pdf
@@ -17,7 +17,7 @@
  # commands
  
  ## for LaTeX
-@@ -69,22 +71,31 @@
+@@ -69,22 +71,28 @@
  CLNT_OCAMLINC:=-I net -I lib -I $(EQUEUEDIR) -I $(RPCDIR) \
                 -I lablgtk2-clnt
  
@@ -27,7 +27,7 @@
  	  pxp_engine.cmxa pxp_lex_utf8.cmxa pxp_lex_link_utf8.cmx \
  	  nums.cmxa cduce_lib.cmxa
  
-+SRV_CMXALIBS:=unix.cmxa threads.cmxa \
++SRV_CMXALIBS:=threads.cmxa \
 +	  gramlib.cmxa \
 +	  nums.cmxa
 +
@@ -37,10 +37,7 @@
  
 -CLNT_CMXALIBS:= unix.cmxa equeue.cmxa rpc.cmxa str.cmxa \
 -	        lablgtk.cmxa lablglade.cmxa
-+#CLNT_CMXALIBS:= unix.cmxa equeue.cmxa rpc.cmxa str.cmxa \
-+#	        lablgtk.cmxa lablglade.cmxa
-+#
-+CLNT_CMXALIBS:=unix.cmxa lablgtk.cmxa lablglade.cmxa
++CLNT_CMXALIBS:=lablgtk.cmxa lablglade.cmxa
  
  CLNT_CMALIBS:=$(patsubst %.cmx,%.cmo,$(CLNT_CMXALIBS:%.cmxa=%.cma))
  
@@ -49,7 +46,7 @@
 +
  OCAMLC:=ocamlc.opt
 -OCAMLOPT:=ocamlopt.opt
-+OCAMLOPT:=ocamlfind ocamlopt -package "$(PACKAGES)"
++OCAMLOPT:=ocamlfind ocamlopt -linkpkg -package "$(PACKAGES)"
  OCAMLDEP:=ocamldep
  OCAMLLEX:=ocamllex
  OCAMLYACC:=ocamlyacc