diff --git a/subversion.spec b/subversion.spec
index 656c33e..e480d44 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,6 +1,5 @@
 # set to zero to avoid running test suite
 %define make_check 1
-#define with_java %{?_with_java:1}%{!?_with_java:0}
 %define with_java 1
 
 # set JDK path to build javahl; default for JPackage
@@ -112,12 +111,18 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --enable-swig-bindings=perl,python
 make %{?_smp_mflags} all
-make swig-pl swig-py %{?_with_java:javahl} %{swigdirs}
+make swig-pl swig-py %{swigdirs}
+%if %{with_java}
+make javahl
+%endif
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install install-swig-py install-swig-pl-lib %{?_with_java:install-javahl} \
+make install install-swig-py install-swig-pl-lib \
         DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
+%if %{with_java}
+make install-javahl
+%endif
 
 make pure_vendor_install -C subversion/bindings/swig/perl/native \
         PERL_INSTALL_ROOT=$RPM_BUILD_ROOT