diff options
| author | James McCoy <jamessan@debian.org> | 2018-04-07 10:45:54 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2018-04-07 10:45:54 -0400 |
| commit | a93d192468bba7499f93dc03f56ee0191071eb8b (patch) | |
| tree | 704d30ce677bcd72cd2e7a8c9ed1df0f48139ca8 /debian | |
| parent | b043c34e1794232ba6681b81dd8c71d97c1a2a58 (diff) | |
rules: Move install-javahl-java rule to install-arch
Even though this is installing arch-all files, they are being installed
into an arch-any package. This is leftover from the attempted split up
of libsvn-java into libsvn-jni (Arch:any) and libsvn-java (Arch:all).
This was failing the build with Java 9 since "jar cf" now fails when it
can't find the expected files, instead of just logging a warning.
Signed-off-by: James McCoy <jamessan@debian.org>
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/rules | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules index f9b5603..1a7fb36 100755 --- a/debian/rules +++ b/debian/rules @@ -284,13 +284,6 @@ debian/stamp-install-indep: debian/stamp-build-indep dh_prep -i dh_installdirs -i -ifdef DEB_OPT_WITH_JAVAHL - $(MAKE_B) install-javahl-java \ - DESTDIR=$(CURDIR)/debian/tmp \ - javahl_javadir=/usr/share/java \ - javahl_javahdir=/usr/include/svn-javahl -endif - dh_install -i dh_installdocs -i NOTICE @@ -325,7 +318,7 @@ debian/stamp-install-arch: debian/stamp-build-arch $(RM) debian/tmp/usr/lib/python*/*-packages/libsvn/*.a ifdef DEB_OPT_WITH_JAVAHL - $(MAKE_B) install-javahl \ + $(MAKE_B) install-javahl install-javahl-java \ DESTDIR=$(CURDIR)/debian/tmp \ javahl_javadir=/usr/share/java \ javahl_javahdir=/usr/include/svn-javahl |