[Pkg-ocaml-maint-commits] [menhir] 05/07: Use native/byte targets instead of $(OCAML_BEST)

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository menhir.

commit 0b357ba6794a2ecbb8015e25f7731a70ab82a114
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Mar 24 22:15:31 2014 +0100

    Use native/byte targets instead of $(OCAML_BEST)
---
 debian/changelog | 1 +
 debian/rules     | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d719883..abba1c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ menhir (20130911.dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Add ocaml-findlib to Build-Depends.
+  * Use native/byte targets instead of $(OCAML_BEST)
 
  -- Mehdi Dogguy <mehdi at debian.org>  Mon, 24 Mar 2014 22:04:01 +0100
 
diff --git a/debian/rules b/debian/rules
index f5fee37..8bf26d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,20 @@ export DH_VERBOSE=1
 include /usr/share/ocaml/ocamlvars.mk
 
 DESTDIR := $(CURDIR)/debian/menhir
+BEST := native
+ifneq ($(OCAML_BEST),opt)
+BEST = byte
+endif
+
 
 override_dh_auto_build:
-	$(MAKE) TARGET=$(OCAML_BEST) PREFIX=/usr
+	$(MAKE) TARGET=$(BEST) PREFIX=/usr
 
 override_dh_auto_clean:
 	$(MAKE) -C src/ clean PREFIX=$(DESTDIR)/usr
 
 override_dh_auto_install:
-	cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
+	cp src/menhir.$(BEST) $(DESTDIR)/usr/bin/menhir
 
 override_dh_auto_test:
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/menhir.git