[Pkg-ocaml-maint-commits] [menhir] 05/06: Use Upstream's Makefile to install files

[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 565d17ab0648a383d7b9cc77fbe2f4a5fbb35bc2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 21:47:09 2016 +0100

    Use Upstream's Makefile to install files
---
 debian/changelog | 1 +
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a7599e6..71d86ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ menhir (20151112.dfsg-1) UNRELEASED; urgency=medium
     - Refresh patches
     - Add 0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch
       to avoid FTBFS on bytecode architectures.
+  * Use Upstream's Makefile to install files
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 17 Jan 2016 20:50:29 +0100
 
diff --git a/debian/rules b/debian/rules
index e445a64..208c670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ export DH_VERBOSE=1
 include /usr/share/ocaml/ocamlvars.mk
 
 DESTDIR := $(CURDIR)/debian/menhir
+export OCAMLFIND_DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 BEST := native
 ifneq ($(OCAML_BEST),opt)
 BEST = byte
@@ -19,7 +20,8 @@ override_dh_auto_clean:
 	$(MAKE) -C src/ clean PREFIX=$(DESTDIR)/usr
 
 override_dh_auto_install:
-	cp src/_stage2/menhir.$(BEST) $(DESTDIR)/usr/bin/menhir
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	$(MAKE) TARGET=$(BEST) PREFIX=$(DESTDIR)/usr install
 
 override_dh_auto_test:
 

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