This fixes installation of JNI files (and other Java relared files) in build systems used by various packaging systems.
>From 271faccbe38f649079ce673c322bed43c064db39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= <j...@seznam.cz> Date: Sat, 30 May 2015 00:00:19 +0200 Subject: [PATCH] Java: install files into DESTDIR --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 50d732d..44fe341 100644 --- a/Makefile.am +++ b/Makefile.am @@ -583,10 +583,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) -- 2.4.2
------------------------------------------------------------------------------
_______________________________________________ sigrok-devel mailing list sigrok-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sigrok-devel
