[Pkg-ocaml-maint-commits] r3074 - /trunk/packages/postgresql-ocaml/trunk/debian/rules

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 08:20:58 2006
New Revision: 3074

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3074
Log:
leftover commit, now control.in removal is properly accounted for

Modified:
    trunk/packages/postgresql-ocaml/trunk/debian/rules

Modified: trunk/packages/postgresql-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/rules?rev=3074&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules Wed Sep  6 08:20:58 2006
@@ -7,16 +7,18 @@
 
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in debian/patches/*.in))
+OFILES := $(filter-out debian/control,$(patsubst %.in,%,$(wildcard debian/*.in)))
 HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+makebuilddir/$(PKGNAME):: ocamlinit
+
 DEB_SRCDIR = $(CURDIR)/lib
 DEB_MAKE_BUILD_TARGET = byte-code-library
 CFLAGS += -I$(shell pg_config --includedir) -fPIC
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
-
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
@@ -30,6 +32,3 @@
 binary-install/$(PKGNAME)::
 	mv $(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)/postgresql/*.so \
 		$(CURDIR)/debian/$(patsubst %-dev,%,$(PKGNAME))$(OCAMLLIBDIR)/stublibs/
-
-# work around cdbs' bug
-unpatch: deapply-dpatches