X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3e2388982bd03ab9e70d3529040dbf92ad975161;hb=025f6ed862b3a1dc8aa5deb3e44b4c2230ef3aa6;hp=ef408422551783b77db9431b629bde299071521d;hpb=e1ccfb191062d13b98bb7536d162a044e0758678;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index ef408422..3e238898 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ libsigrok_la_SOURCES += \ src/scpi/scpi_libgpib.c endif -# modbus support +# Modbus support libsigrok_la_SOURCES += \ src/modbus/modbus.c if NEED_SERIAL @@ -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)