[Pkg-ocaml-maint-commits] [SCM] ocaml-gnuplot packaging branch, master, updated. upstream/0.8.3-34-geaf9b0b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit ef37d7835f6643a7405ea5d93342abe0613b2f7f
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Feb 6 19:35:54 2012 +0100

    make demos makefile selfcontaining

diff --git a/debian/patches/demos_makefile b/debian/patches/demos_makefile
new file mode 100644
index 0000000..69a6c3f
--- /dev/null
+++ b/debian/patches/demos_makefile
@@ -0,0 +1,53 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: make Makefile selfcontaining so that it can be used to compile
+  demos outside of the ocaml-gnuiplot source tree.
+
+Index: ocaml-gnuplot/demos/Makefile
+===================================================================
+--- ocaml-gnuplot.orig/demos/Makefile	2012-02-06 18:35:48.000000000 +0100
++++ ocaml-gnuplot/demos/Makefile	2012-02-06 19:32:45.000000000 +0100
+@@ -2,12 +2,18 @@
+ # ocaml-gnuplot/demos
+ # Copyright (C) Christophe TROESTLER
+ 
+-include ../Makefile.conf
+ 
+-OCAMLFLAGS 	= -I ../
+-OCAMLOPTFLAGS	= -I ../
+-WEBDIR		= ../../webpublishing
+-WEBDIRDOC	= $(WEBDIR)/Gnuplot
++# OCAMLC, OCAMLOPT, OCAMLDEP, OCAMLDOC
++# The location of the OCaml compiler and tools. The defaults should be OK.
++#
++OCAMLC	 = ocamlc
++OCAMLOPT = ocamlopt
++OCAMLDEP = ocamldep
++OCAMLDOC = ocamldoc
++OCAMLFIND = ocamlfind
++
++OCAMLFLAGS 	= -I +gnuplot
++OCAMLOPTFLAGS	= -I +gnuplot
+ 
+ DEMOS_LIBS 	= parse_args.ml
+ DEMOS 		= $(wildcard ex*.ml)
+@@ -23,15 +29,15 @@
+ byte: $(DEMOS:.ml=.exe)
+ opt: $(DEMOS:.ml=.com)
+ 
+-ex%.exe: ex%.ml ../gnuplot.cma $(DEMOS_LIBS:.ml=.cmo)
++ex%.exe: ex%.ml $(DEMOS_LIBS:.ml=.cmo)
+ 	$(OCAMLC) -o $@ $(OCAMLFLAGS) $(PKGS_CMA) $(DEMOS_LIBS:.ml=.cmo) $<
+-ex%.com: ex%.ml ../gnuplot.cmxa $(DEMOS_LIBS:.ml=.cmx)
++ex%.com: ex%.ml $(DEMOS_LIBS:.ml=.cmx)
+ 	$(OCAMLOPT) -o $@ $(OCAMLOPTFLAGS) $(PKGS_CMA:.cma=.cmxa) \
+ 	  $(DEMOS_LIBS:.ml=.cmx) $<
+ 
+-parse_args.cmi: parse_args.mli ../gnuplot.cmi
+-parse_args.cmo: parse_args.ml parse_args.cmi ../gnuplot.cma
+-parse_args.cmx: parse_args.ml parse_args.cmi ../gnuplot.cmxa
++parse_args.cmi: parse_args.mli
++parse_args.cmo: parse_args.ml parse_args.cmi
++parse_args.cmx: parse_args.ml parse_args.cmi
+ 
+ # Caml general dependencies
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx

-- 
ocaml-gnuplot packaging