X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=ruby%2FMakefile.am;h=8139140ae6b0f48a1ac646ffedf6767df89d12fe;hb=HEAD;hp=88d3323d528090ebfd46da8f31b8bc7cdc04d2c9;hpb=04ea1375c55aa67df4e7fc61dbb534111767f3b6;p=libguestfs.git diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 88d3323..8139140 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -49,19 +49,20 @@ TESTS = run-bindtests run-ruby-tests TESTS_ENVIRONMENT = \ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \ LIBGUESTFS_PATH=$(top_builddir)/appliance \ - TMPDIR=$(top_builddir) + TMPDIR=$(top_builddir) \ + RUBY=$(RUBY) all: $(generator_built) - rake build - rake rdoc + $(RAKE) build + $(RAKE) rdoc -RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") +RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']") install: $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH) - $(INSTALL) -p -m 0644 lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB) - $(INSTALL) -p -m 0755 ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH) + $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB) + $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH) endif