[ant] 13/17: Removed the with_gcj_native variable in debian/rules (but keep the logic)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ant.

commit beca8ce6dc4bc865f36aef193519955b2c920fd0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 14:56:31 2017 +0100

    Removed the with_gcj_native variable in debian/rules (but keep the logic)
---
 debian/rules | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 19fc73c..23ecdd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,6 @@
 export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_gcj_native := yes
-endif
-
 DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch
 
 %:
@@ -70,8 +65,9 @@ override_dh_install-indep:
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
 	install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
 
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 override_dh_link-arch:
-ifeq ($(with_gcj_native),yes)
 	dh_nativejava -pant-gcj
 	dh_nativejava -pant-optional-gcj
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git