[libreoffice] 25/36: always enable junit for test jars

[Bjoern Michaelsen <sweetshark-guest@moszumanska.debian.org>]

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

sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.

commit 85b634acd0d49feea2b3825dd8a456ae892be9c2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Sat Jun 7 15:22:10 2014 +0200

    always enable junit for test jars
---
 rules | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rules b/rules
index 5c72ece..d0bec30 100755
--- a/rules
+++ b/rules
@@ -888,13 +888,11 @@ ifeq "$(RUN_MAKE_CHECK)" "y"
 	BUILD_DEPS += , fonts-liberation
   endif
   	#BUILD_DEPS += , fonts-crosextra-carlito
-  ifeq "$(ENABLE_JUNIT4)" "y"
-	BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
-  else
-	CONFIGURE_FLAGS += --without-junit
-  endif
+endif
+ifeq "$(ENABLE_JUNIT4)" "y"
+  BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
 else
-	CONFIGURE_FLAGS += --without-junit
+  CONFIGURE_FLAGS += --without-junit
 endif
 
 ifneq "$(BUILD_ONLY_EN_US)" "y"

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