From: Jiří Pinkava <redacted>
Date: Fri, 29 May 2015 22:00:19 +0000 (+0200)
Subject: Java: install files into DESTDIR
X-Git-Tag: libsigrok-0.4.0~489
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=df705a7af74b156d24b9fa63ca7928e1ea780be2;p=libsigrok.git

Java: install files into DESTDIR

This fixes bug #537.
---

diff --git a/Makefile.am b/Makefile.am
index f3e0bcd8..3e238898 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -597,10 +597,10 @@ $(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
 		-lsigrokcxx -o $(JLIB)
 
 java-install:
-	$(INSTALL) -d $(libdir)/jni
-	$(INSTALL) $(JLIB) -t $(libdir)/jni
-	$(INSTALL) -d $(datadir)/java
-	$(INSTALL) $(JJAR) -t $(datadir)/java
+	$(INSTALL) -d $(DESTDIR)$(libdir)/jni
+	$(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni
+	$(INSTALL) -d $(DESTDIR)$(datadir)/java
+	$(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java
 
 java-clean:
 	$(AM_V_at)rm -f $(JCXX)