[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-9-14-g7ca479c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit f583de49edc9ad00b3214d322a876a44a103d42e
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jun 7 11:54:15 2009 +0200

    Install library files to a subdirectory of `ocamlc -where` (Closes: #482917)

diff --git a/debian/Makefile b/debian/Makefile
index 12472dd..c2f2d0e 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -17,7 +17,10 @@ allopt: native-code-library byte-code-library pycaml.customtop
 
 all: byte-code-library pycaml.customtop
 
-pycaml.customtop: pycaml.cma
-	ocamlmktop -o pycaml.customtop pycaml.cma
+pycaml.customtop: pycaml.cma pycamltop.cmo
+	ocamlmktop -o pycaml.customtop pycaml.cma pycamltop.cmo
+
+pycamltop.ml:
+	echo 'Topdirs.dir_directory "+pycaml"' > $@
 
 -include $(OCAMLMAKEFILE)
diff --git a/debian/rules b/debian/rules
index f03ef8c..1d35115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,8 @@ install: build
 	#cp pycaml.{a,cma,cmi,cmx,cmxa} pycaml_ml.o pycaml_ml.opt.o \
 	#	debian/pycaml/usr/lib/ocaml/3.07
 	#cp pycamltop debian/pycaml/usr/bin
-	make rawinstall OCAML_LIB_INSTALL=$(DESTDIR)
-	mv $(DESTDIR)/dllpycaml_stubs.so $(DESTDIR)/stublibs
+	make rawinstall OCAML_LIB_INSTALL=$(DESTDIR)/pycaml
+	mv $(DESTDIR)/pycaml/dllpycaml_stubs.so $(DESTDIR)/stublibs
 	cp pycaml.customtop debian/pycaml/usr/bin/pycamltop
 
 # Build architecture-independent files here.

-- 
pycaml packaging