[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20090204.dfsg-1-3-g050be64

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 050be647272e5719670a65f702af53a797a259ac
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Feb 20 10:20:57 2009 +0100

    Use predefined variable OCAML_BEST (dh-ocaml >= 0.3)

diff --git a/debian/changelog b/debian/changelog
index 773a61c..7991087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ menhir (20090204.dfsg-2) UNRELEASED; urgency=low
 
   * Depend on ocaml-nox, Closes: #516134.
   * Use dh-ocaml predefined variables.
+  * Use predefined variable OCAML_BEST (dh-ocaml >= 0.3).
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 19 Feb 2009 23:41:32 +0100
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 20 Feb 2009 10:18:45 +0100
 
 menhir (20090204.dfsg-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 2d07182..b78f84b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
   debhelper (>= 7.0.0),
   dpatch,
   ocaml-nox (>= 3.11.0),
-  dh-ocaml (>= 0.2)
+  dh-ocaml (>= 0.3)
 Standards-Version: 3.8.0
 DM-Upload-Allowed: yes
 Homepage: http://gallium.inria.fr/~fpottier/menhir/
diff --git a/debian/rules b/debian/rules
index 62ac337..5096bca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,30 +8,24 @@ include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR := $(CURDIR)/debian/menhir
-ifeq ($(OCAML_HAVE_OCAMLOPT), yes)
-  TARGET   := opt
-else
-  TARGET   := byte
-endif
+STRIPOPT := $(if $(OCAML_OPT_ARCH),-e "/native/d",-e "")
 
 build: ocamlinit-stamp build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-	$(MAKE) TARGET=$(TARGET) PREFIX=/usr
-ifeq ($(OCAML_HAVE_OCAMLOPT), no)
-	sed -e "/native/d" src/META > META
-endif
+	$(MAKE) TARGET=$(OCAML_BEST) PREFIX=/usr
+	sed $(STRIPOPT) src/META > META
 	dh build --after auto_build
 	touch $@
 
 clean: unpatch ocamlinit-clean
 	dh clean
-	$(MAKE) -C src/ clean PREFIX=$(CURDIR)/debian/menhir/usr
+	$(MAKE) -C src/ clean PREFIX=$(DESTDIR)/usr
 
 install: build install-stamp
 install-stamp:
 	dh install --before auto_install
-	cp src/menhir.$(TARGET) $(DESTDIR)/usr/bin/menhir
+	cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
 	dh install --after auto_install
 	touch $@
 

-- 
menhir packaging