diff options
| -rw-r--r-- | patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch b/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch index 7727b1be4..9bf20acb6 100644 --- a/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch +++ b/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch @@ -7,13 +7,22 @@ to start with $(SYSROOT). Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 65bff86..ce0b147 100644 +index 65bff86..8ebb3d3 100644 --- a/Makefile +++ b/Makefile +@@ -88,7 +88,7 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc + sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@ + + libdbus-java-$(VERSION).jar: .classes +- echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest ++ echo "Class-Path: ${JARPREFIX}/unix.jar ${JARPREFIX}/hexdump.jar ${JARPREFIX}/debug-$(DEBUG).jar" > Manifest + (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class) + dbus-java-test-$(VERSION).jar: .testclasses + echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest @@ -141,7 +141,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc $(DOCBOOKTOMAN) $< > $@ |