[Pkg-ocaml-maint-commits] r6390 - in /trunk/packages/otags/trunk/debian: dirs.in rules

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Wed Jun 24 19:54:27 2009
New Revision: 6390

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6390
Log:
complete removal of stdlib dir

Modified:
    trunk/packages/otags/trunk/debian/dirs.in
    trunk/packages/otags/trunk/debian/rules

Modified: trunk/packages/otags/trunk/debian/dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/debian/dirs.in?rev=6390&op=diff
==============================================================================
--- trunk/packages/otags/trunk/debian/dirs.in (original)
+++ trunk/packages/otags/trunk/debian/dirs.in Wed Jun 24 19:54:27 2009
@@ -1,4 +1,4 @@
 usr/bin
-usr/lib/ocaml/#OCamlABI#/otags
+ at OCamlStdlibDir@/otags
 var/lib/otags/emacs
 var/lib/otags/vi

Modified: trunk/packages/otags/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/debian/rules?rev=6390&op=diff
==============================================================================
--- trunk/packages/otags/trunk/debian/rules (original)
+++ trunk/packages/otags/trunk/debian/rules Wed Jun 24 19:54:27 2009
@@ -8,14 +8,9 @@
 
 PACKAGE=otags
 include /usr/share/ocaml/ocamlvars.mk
+include /usr/share/ocaml/ocamlinit.mk
 include /usr/share/dpatch/dpatch.make
 
-.PHONY: ocamlinit
-
-ocamlinit: debian/dirs.in
-	for t in $^; do \
-	    sed -e 's%#OCamlABI#%$(OCAML_ABI)%' $$t >$${t%.in}; \
-	done
 configure-stamp: patch-stamp configure
 	dh_testdir
 	./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode
@@ -31,7 +26,7 @@
 
 	touch build-stamp
 
-clean: patch clean1 unpatch
+clean: patch clean1 unpatch ocamlinit-clean
 clean1:
 	dh_testdir
 	dh_testroot