[Libguestfs] [PATCH] out of tree build: ruby (second take)

--- ruby/Rakefile.in | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in index da9f3f1..2587476 100644 --- a/ruby/Rakefile.in +++ b/ruby/Rakefile.in @@ -24,10 +24,10 @@ require 'rake/gempackagetask' PKG_NAME='@PACKAGE_NAME@' PKG_VERSION='@PACKAGE_VERSION@' -EXT_CONF=&#39;@srcdir(a)/ext/hivex/extconf.rb&#39; +EXT_CONF=&#39;@abs_srcdir(a)/ext/hivex/extconf.rb&#39; MAKEFILE='@builddir@/ext/hivex/Makefile' HIVEX_MODULE=&#39;@builddir(a)/ext/hivex/_hivex.so&#39; -HIVEX_SRC=&#39;@srcdir(a)/ext/hivex/_hivex.c&#39; +HIVEX_SRC=&#39;@abs_srcdir(a)/ext/hivex/_hivex.c&#39; CLEAN.include [ &quot;@builddir(a)/ext/**/*.o&quot;, HIVEX_MODULE, "@builddir@/ext/**/depend" ] @@ -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-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" + unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; ruby #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" $stderr.puts "Failed to run extconf" break end end file HIVEX_MODULE => [ MAKEFILE, HIVEX_SRC ] do |t| - Dir::chdir(File::dirname(EXT_CONF)) do + Dir::chdir("@builddir@/ext/hivex") 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/**/*", -- 1.7.7.3