[Pkg-ocaml-maint-commits] [coccinelle] 03/04: Remove obsolete COCCI_FLAGS variable

[Eugeniy Meshcheryakov]

This is an automated email from the git hooks/post-receive script.

eugen pushed a commit to branch master
in repository coccinelle.

commit f004cd25ac3d5e156c15350881e5ac6d6b1e0acd
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Wed Dec 25 23:21:35 2013 +0100

    Remove obsolete COCCI_FLAGS variable
---
 debian/changelog |  3 ++-
 debian/rules     | 12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d370d0d..60c85a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ coccinelle (1.0.0~rc19.deb-3) unstable; urgency=medium
     - detect-itimer.diff — detect architectures without [gs]etitimer API
       support. This should fix testsuite failures on Hurd.
   * Pass --enable-release to configure
+  * Remove obsolete COCCI_FLAGS variable
 
- -- Євгеній Мещеряков <eugen at debian.org>  Wed, 25 Dec 2013 22:56:26 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Wed, 25 Dec 2013 23:21:13 +0100
 
 coccinelle (1.0.0~rc19.deb-2) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 99f21b3..23cef1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-COCCI_FLAGS = BYTECODE_STATIC="" MANDIR=/usr/share/man
-
 VIM_ADIR = $(CURDIR)/debian/coccinelle/usr/share/vim/addons
 VIM_RDIR = $(CURDIR)/debian/coccinelle/usr/share/vim/registry
 
@@ -23,23 +21,23 @@ override_dh_auto_configure:
 	./configure $(CONFIG_FLAGS)
 
 override_dh_auto_build-arch:
-	$(MAKE) $(COCCI_FLAGS) depend
+	$(MAKE) depend
 	# make all.opt does not build documentation
-	$(MAKE) $(COCCI_FLAGS) -C docs all
+	$(MAKE) -C docs all
 	# Re-create this directory here because git does not store empty directories
 	mkdir -p ocaml/coccilib
-	dh_auto_build -- $(COCCI_FLAGS)
+	dh_auto_build
 
 override_dh_auto_build-indep:
 	mkdir texmf-var
 	mkdir texmf-config
-	TEXMFVAR="$(CURDIR)/texmf-var" TEXMFCONFIG="$(CURDIR)/texmf-config" $(MAKE) $(COCCI_FLAGS) -C docs/manual all-pdf
+	TEXMFVAR="$(CURDIR)/texmf-var" TEXMFCONFIG="$(CURDIR)/texmf-config" $(MAKE) -C docs/manual all-pdf
 
 override_dh_auto_test:
 	$(MAKE) check
 
 override_dh_auto_install-arch:
-	$(MAKE) DESTDIR=$(CURDIR)/debian/coccinelle $(COCCI_FLAGS) install install-bash
+	$(MAKE) DESTDIR=$(CURDIR)/debian/coccinelle install install-bash
 	# install the wrapper script, i dont like upstreams one
 	rm $(CURDIR)/debian/coccinelle/usr/bin/spatch*
 	install $(CURDIR)/debian/spatch $(CURDIR)/debian/coccinelle/usr/bin/

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