]> sigrok.org Git - libsigrok.git/commitdiff
Java: install files into DESTDIR
authorJiří Pinkava <redacted>
Fri, 29 May 2015 22:00:19 +0000 (00:00 +0200)
committerUwe Hermann <redacted>
Sat, 13 Jun 2015 15:28:51 +0000 (17:28 +0200)
This fixes bug #537.

Makefile.am

index f3e0bcd895e94ecae6c1684e11e8a119e9a726f8..3e2388982bd03ab9e70d3529040dbf92ad975161 100644 (file)
@@ -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)