--- ruby/Makefile.am | 4 ++-- ruby/Rakefile.in | 18 +++++++++--------- ruby/run-bindtests | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 112512b..032ace2 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -62,7 +62,7 @@ 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 diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in index 7c5a63a..f4bf901 100644 --- a/ruby/Rakefile.in +++ b/ruby/Rakefile.in @@ -24,7 +24,7 @@ require 'rake/gempackagetask' PKG_NAME='@PACKAGE_NAME@' PKG_VERSION='@PACKAGE_VERSION@' -EXT_CONF=&#39;@srcdir(a)/ext/guestfs/extconf.rb&#39; +EXT_CONF=&#39;@abs_srcdir(a)/ext/guestfs/extconf.rb&#39; MAKEFILE='@builddir@/ext/guestfs/Makefile' GUESTFS_MODULE=&#39;@builddir(a)/ext/guestfs/_guestfs.so&#39; GUESTFS_SRC=&#39;@srcdir(a)/ext/guestfs/_guestfs.c&#39; @@ -38,13 +38,13 @@ CLOBBER.include [ &quot;@builddir(a)/config.save&quot;, &quot;@builddir(a)/ext/**/mkmf.log&quot;, # Build locally file MAKEFILE => EXT_CONF do |t| - unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs" + unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; ruby #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs" $stderr.puts "Failed to run extconf" break end end file GUESTFS_MODULE => [ MAKEFILE, GUESTFS_SRC ] do |t| - Dir::chdir(File::dirname(EXT_CONF)) do + Dir::chdir("@builddir@/ext/guestfs") do unless sh "make" $stderr.puts "make failed" break @@ -61,19 +61,19 @@ end task :test => :build RDOC_FILES = FileList[ - "README.rdoc", - "lib/**/*.rb", - "ext/**/*.[ch]" + &quot;@srcdir(a)/README.rdoc&quot;, + &quot;@srcdir(a)/lib/**/*.rb&quot;, + &quot;@srcdir(a)/ext/**/*.[ch]&quot; ] Rake::RDocTask.new do |rd| - rd.main = "README.rdoc" + rd.main = &quot;@srcdir(a)/README.rdoc&quot; rd.rdoc_dir = "doc/site/api" rd.rdoc_files.include(RDOC_FILES) end Rake::RDocTask.new(:ri) do |rd| - rd.main = "README.rdoc" + rd.main = &quot;@srcdir(a)/README.rdoc&quot; rd.rdoc_dir = "doc/ri" rd.options << "--ri-system" rd.rdoc_files.include(RDOC_FILES) @@ -82,7 +82,7 @@ end # Package tasks PKG_FILES = FileList[ - "Rakefile", "COPYING", "README", "NEWS", "README.rdoc", + "Rakefile", "COPYING", "README", "NEWS", &quot;@srcdir(a)/README.rdoc&quot;, "lib/**/*.rb", "ext/**/*.[ch]", "ext/**/MANIFEST", "ext/**/extconf.rb", "tests/**/*", diff --git a/ruby/run-bindtests b/ruby/run-bindtests index a78b5f6..4cac863 100755 --- a/ruby/run-bindtests +++ b/ruby/run-bindtests @@ -18,5 +18,5 @@ set -e -ruby -Ilib -Iext/guestfs bindtests.rb > bindtests.tmp +ruby -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp diff -u ${srcdir}/../bindtests bindtests.tmp -- 1.7.7.3