[Pkg-ocaml-maint-commits] [SCM] ocaml-deriving-ocsigen packaging branch, master, updated. debian/0.1.1a-3-17-gb6a041e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 847370b1a63dce080b671159e5230287850127dc
Author: Pierre Chambart <chambart at crans.org>
Date:   Sat Nov 19 14:24:15 2011 +0100

    Update debian/rules

diff --git a/debian/rules b/debian/rules
index 5a49c71..71374d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,40 +8,28 @@ DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 
-OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
-export OCAMLFIND_DESTDIR
-OCAMLFIND_LDCONF=ignore
-export OCAMLFIND_LDCONF
+export OCAMLFIND_DESTDIR := $(DESTDIR)/$(OCAML_STDLIB_DIR)
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+  BUILD_TARGET := byte opt
+  INSTALL_TARGET := install
+else
+  BUILD_TARGET := byte
+  INSTALL_TARGET := install-byte
+endif
 
 %:
 	dh --with ocaml $@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	$(MAKE) built
-else
-	$(MAKE) -C syntax 
-	$(MAKE) -C lib bcl
-endif
+	$(MAKE) $(BUILD_TARGET)
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	mkdir -p '$(DESTDIR)/usr/bin'
-	ocamlfind install deriving \
-	  debian/META \
-		-patch-version $$(dpkg-parsechangelog | grep 'Version: ' | cut -d : -f 2) \
-		$(wildcard lib/*.cma lib/*.cmxa lib/*.a lib/*.mli lib/*.cmi lib/*.cmx)
-	install -m 0755 syntax/deriving '$(DESTDIR)/usr/bin'
+	mkdir -p $(OCAMLFIND_DESTDIR)
+	$(MAKE) $(INSTALL_TARGET)
 
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	$(MAKE) clean
-
-debian/%.1: debian/%.mkd
-	pandoc -s -w man $^ -o $@

-- 
ocaml-deriving-ocsigen packaging