projects / packages / libsigrok.git / blame
| Commit | Line | Data |
|---|---|---|
| 0cc2b984 JR |
1 | diff -urNp -x '*.orig' libsigrok-0.5.2.org/Makefile.am libsigrok-0.5.2/Makefile.am |
| 2 | --- libsigrok-0.5.2.org/Makefile.am 2021-03-05 22:45:56.670754148 +0100 | |
| 3 | +++ libsigrok-0.5.2/Makefile.am 2021-03-05 22:45:56.734087208 +0100 | |
| 4 | @@ -868,8 +868,8 @@ $(REXT): $(ROBJ) @ORDER@ bindings/cxx/li | |
| 5fadb5f6 AM |
5 | ruby-build: $(REXT) |
| 6 | ||
| 7 | ruby-install: $(REXT) | |
| 8 | - $(INSTALL) -d $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR) | |
| 9 | - $(INSTALL) $(REXT) $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR) | |
| 10 | + $(INSTALL) -d $(DESTDIR)$(RBSIGROK_EXTDIR) | |
| 11 | + $(INSTALL) $(REXT) $(DESTDIR)$(RBSIGROK_EXTDIR) | |
| 12 | ||
| 13 | ruby-uninstall: | |
| 14 | rm -f $(DESTDIR)$(prefix)/$(RBSIGROK_EXTDIR)/sigrok.$(RUBY_DLEXT) | |
| 0cc2b984 JR |
15 | diff -urNp -x '*.orig' libsigrok-0.5.2.org/configure.ac libsigrok-0.5.2/configure.ac |
| 16 | --- libsigrok-0.5.2.org/configure.ac 2019-12-25 21:29:19.000000000 +0100 | |
| 17 | +++ libsigrok-0.5.2/configure.ac 2021-03-05 22:45:56.734087208 +0100 | |
| 18 | @@ -566,7 +566,7 @@ PKG_CHECK_MODULES([TESTS], [$SR_PKGLIBS_ | |
| 19 | AM_COND_IF([BINDINGS_CXX], [ | |
| 20 | PKG_CHECK_MODULES([LIBSIGROKCXX], [$SR_PKGLIBS_CXX]) | |
| 21 | PKG_CHECK_MODULES([PYSIGROK], [$SR_PKGLIBS_PYTHON $SR_PKGLIBS_CXX]) | |
| 22 | - PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "lib/$($PKG_CONFIG --variable=sitearch $SR_PKGLIBS_RUBY)/$($PKG_CONFIG --variable=RUBY_BASE_NAME $SR_PKGLIBS_RUBY)/vendor_ruby/$($PKG_CONFIG --variable=ruby_version $SR_PKGLIBS_RUBY)")]) | |
| 23 | + PKG_CHECK_MODULES([RBSIGROK], [$SR_PKGLIBS_RUBY $SR_PKGLIBS_CXX], [AC_SUBST(RBSIGROK_EXTDIR, "$($PKG_CONFIG --variable=vendorarchdir $SR_PKGLIBS_RUBY)")]) | |
| 24 | ]) | |
| 25 | ||
| 26 | # Check for specific libusb features, now that we know the CFLAGS. |