[Pkg-ocaml-maint-commits] r1953 - trunk/packages/camlidl/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 14:26:43 +0000 (Wed, 09 Nov 2005)
New Revision: 1953

Added:
   trunk/packages/camlidl/trunk/debian/camlidl.dirs
   trunk/packages/camlidl/trunk/debian/camlidl.docs
Removed:
   trunk/packages/camlidl/trunk/debian/dirs
   trunk/packages/camlidl/trunk/debian/docs
Modified:
   trunk/packages/camlidl/trunk/debian/changelog
   trunk/packages/camlidl/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Copied: trunk/packages/camlidl/trunk/debian/camlidl.dirs (from rev 1933, trunk/packages/camlidl/trunk/debian/dirs)
===================================================================
--- trunk/packages/camlidl/trunk/debian/dirs	2005-11-07 21:47:08 UTC (rev 1933)
+++ trunk/packages/camlidl/trunk/debian/camlidl.dirs	2005-11-09 14:26:43 UTC (rev 1953)
@@ -0,0 +1 @@
+usr/bin

Copied: trunk/packages/camlidl/trunk/debian/camlidl.docs (from rev 1933, trunk/packages/camlidl/trunk/debian/docs)

Modified: trunk/packages/camlidl/trunk/debian/changelog
===================================================================
--- trunk/packages/camlidl/trunk/debian/changelog	2005-11-09 08:39:42 UTC (rev 1952)
+++ trunk/packages/camlidl/trunk/debian/changelog	2005-11-09 14:26:43 UTC (rev 1953)
@@ -1,3 +1,9 @@
+camlidl (1.05-5) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 15:22:47 +0100
+
 camlidl (1.05-4) unstable; urgency=low
 
   * Transition to svn-buildpackage

Deleted: trunk/packages/camlidl/trunk/debian/dirs
===================================================================
--- trunk/packages/camlidl/trunk/debian/dirs	2005-11-09 08:39:42 UTC (rev 1952)
+++ trunk/packages/camlidl/trunk/debian/dirs	2005-11-09 14:26:43 UTC (rev 1953)
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/ocaml/3.08.3
-usr/lib/ocaml/3.08.3/caml

Deleted: trunk/packages/camlidl/trunk/debian/docs
===================================================================
--- trunk/packages/camlidl/trunk/debian/docs	2005-11-09 08:39:42 UTC (rev 1952)
+++ trunk/packages/camlidl/trunk/debian/docs	2005-11-09 14:26:43 UTC (rev 1953)
@@ -1 +0,0 @@
-README

Modified: trunk/packages/camlidl/trunk/debian/rules
===================================================================
--- trunk/packages/camlidl/trunk/debian/rules	2005-11-09 08:39:42 UTC (rev 1952)
+++ trunk/packages/camlidl/trunk/debian/rules	2005-11-09 14:26:43 UTC (rev 1953)
@@ -7,13 +7,18 @@
 
 include /usr/share/dpatch/dpatch.make
 
+OCAMLIBDIR=$(shell ocamlc -where)
+
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-
 	$(MAKE) all
-	if [ -x /usr/bin/ocamlopt ]; then $(MAKE) opt; else true; fi
-
+	# TODO: check for byte compilation
+	if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
+		$(MAKE) opt; \
+	else \
+		true; \
+	fi 
 	touch build-stamp
 
 clean: unpatch
@@ -29,6 +34,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	mkdir -p $(CURDIR)/debian/camlidl/$(OCAMLIBDIR)/caml
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/camlidl
 
 binary-arch: build install