[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. upstream/0.5-14-g0cd7568

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 97fae0cf086893136e63d62b301c082d5ee9ac43
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Feb 8 12:10:41 2009 +0100

    Update debian/rules

diff --git a/debian/mlpost.dirs.in b/debian/mlpost.dirs.in
index 67d7a34..fd87e42 100644
--- a/debian/mlpost.dirs.in
+++ b/debian/mlpost.dirs.in
@@ -1,2 +1,3 @@
 usr/bin
+usr/share/man/man1
 @OCamlStdlibDir@/mlpost
diff --git a/debian/rules b/debian/rules
index 5f9f93e..6839858 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,21 @@ include /usr/share/cdbs/1/class/ocaml.mk
 
 DESTDIR = $(CURDIR)/debian/mlpost/$(OCAML_STDLIB_DIR)/mlpost
 PREFIX = $(CURDIR)/debian/mlpost/usr
-DEB_MAKE_INSTALL_TARGET = install OCAMLLIB=$(DESTDIR) prefix=$(PREFIX)
+DEB_MAKE_INSTALL_TARGET = install LIBDIR=$(DESTDIR) prefix=$(PREFIX)
 DEB_MAKE_BUILD_TARGET = all doc
 
-FILES_TO_BACKUP = .depend version.ml tool.ml
+FILES_TO_BACKUP = .depend version.ml scan_prelude.ml
 EXAMPLES_TARBALL = debian/examples.tar.gz
 
-pre-build:: debian/META
+pre-build::
 	tar -czf $(EXAMPLES_TARBALL) --exclude=parse.ml examples
 # Backup generated files
 	for u in $(FILES_TO_BACKUP); do \
 	  if [ ! -f debian/$$u.backup ]; then cp $$u debian/$$u.backup; fi \
 	done
 
-debian/META: debian/META.template ocamlinit-stamp
-	sed 's/@VERSION@/$(shell sed -n 's/^VERSION *= *//p' Makefile.in)/' $< > $@
-
 clean::
-	rm -Rf $(EXAMPLES_TARBALL) html tool.byte debian/META
+	rm -Rf $(EXAMPLES_TARBALL) html tool.byte
 # Restore upstream tree
 	for u in $(FILES_TO_BACKUP); do \
 	  if [ -f debian/$$u.backup ]; then mv debian/$$u.backup $$u; fi \
@@ -33,7 +30,7 @@ common-install-prehook-impl::
 	mv doc html
 
 install/mlpost::
-	cp mlpost.mli debian/META $(DESTDIR)
+	cp mlpost.mli META $(DESTDIR)
 
 redo-patches::
 	rm -f debian/patches/*

-- 
mlpost packaging