The following commit has been merged in the master branch:
commit 05161f16df1987ba6c66048bc3d94e82dcd6a167
Author: Samuel Mimram <[email protected]>
Date: Wed Feb 11 17:51:49 2009 +0100
Better installation.
diff --git a/debian/jocaml.dirs.in b/debian/jocaml.dirs.in
index 7f7937b..b95cceb 100644
--- a/debian/jocaml.dirs.in
+++ b/debian/jocaml.dirs.in
@@ -1,6 +1,2 @@
usr/bin
-usr/lib/jocaml/@JOCamlABI@/
-usr/lib/jocaml/@JOCamlABI@/stublibs
-usr/lib/jocaml/@JOCamlABI@/threads
-usr/lib/jocaml/@JOCamlABI@/vmthreads
-usr/lib/jocaml/@JOCamlABI@/caml
+usr/lib/ocaml/@JOCamlABI@/
diff --git a/debian/jocaml.install.in b/debian/jocaml.install.in
index 824a0aa..a443fd5 100644
--- a/debian/jocaml.install.in
+++ b/debian/jocaml.install.in
@@ -1,3 +1,3 @@
usr/bin/jocaml*
-usr/lib/ocaml/@JOCamlABI@/threads/jocaml*
-usr/lib/ocaml/@JOCamlABI@/vmthreads/jocaml*
+usr/lib/ocaml/@JOCamlABI@/threads/join*
+usr/lib/ocaml/@JOCamlABI@/vmthreads/join*
diff --git a/debian/rules b/debian/rules
index 072683d..8bc9682 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,9 @@ pre-config:
config-stamp: pre-config
dh_testdir
- ./configure --prefix /usr \
+ ./configure --prefix /usr \
--libdir /usr/lib/ocaml/$(JOCAMLABI) \
- --mandir /usr/share/man \
+ --mandir /usr/share/man \
--host $(DEB_HOST_GNU_TYPE)
touch $@
@@ -69,15 +69,13 @@ install: build-arch build-indep
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) PREFIX=$(CURDIR)/debian/jocaml/usr
LIBDIR=$(CURDIR)/debian/jocaml/usr/lib/jocaml/$(JOCAMLABI) install
- chmod +x $(CURDIR)/debian/jocaml/usr/lib/jocaml/$(JOCAMLABI)/camlheader
- find $(CURDIR)/debian/jocaml/ -type f -iname "*.ml" -exec rm -f {} \;
- $(RM) -f $(CURDIR)/debian/jocaml/usr/bin/ocaml*
+ mkdir -p $(CURDIR)/debian/tmp/usr
+ $(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr
LIBDIR=$(CURDIR)/debian/tmp/usr/lib/ocaml/$(JOCAMLABI) install
binary-common:
dh_testdir
dh_testroot
- dh_install --sourcedir=$(CURDIR)/debian/jocaml --list-missing
+ dh_install --sourcedir=$(CURDIR)/debian/tmp
dh_installchangelogs Changes
dh_installdocs
dh_installman
--
jocaml packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
