diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-11-29 10:50:06 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-11-29 10:56:28 +0000 |
| commit | aad1c2dec4d2652803560ca1cafcb249bb14638f (patch) | |
| tree | 961eb78edec509b6a55f27b0047a042ef5760ae6 | |
| parent | 48d2e0d9ea5c12ae81f31706fa463f8e1ebd09af (diff) | |
| download | hivex-aad1c2dec4d2652803560ca1cafcb249bb14638f.tar.gz hivex-aad1c2dec4d2652803560ca1cafcb249bb14638f.tar.xz hivex-aad1c2dec4d2652803560ca1cafcb249bb14638f.zip | |
Revert "out of tree build: ruby"
This reverts commit 48d2e0d9ea5c12ae81f31706fa463f8e1ebd09af.
This commit breaks the ordinary build:
make[2]: Entering directory `/home/rjones/d/hivex/ruby'
rake build
rake/rdoctask is deprecated. Use rdoc/task instead (in RDoc 2.4.2+)
rake/gempackagetask is deprecated. Use rubygems/package_task instead
top_srcdir=$(pwd)/..; top_builddir=$(pwd)/..; export ARCHFLAGS="-arch $(uname -m)"; mkdir -p ./ext/guestfs; cd ./hivex; ruby #(EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs
sh: line 0: cd: ./hivex: No such file or directory
| -rw-r--r-- | ruby/Rakefile.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in index 99a195d..da9f3f1 100644 --- a/ruby/Rakefile.in +++ b/ruby/Rakefile.in @@ -27,7 +27,7 @@ PKG_VERSION='@PACKAGE_VERSION@' EXT_CONF='@srcdir@/ext/hivex/extconf.rb' MAKEFILE='@builddir@/ext/hivex/Makefile' HIVEX_MODULE='@builddir@/ext/hivex/_hivex.so' -HIVEX_SRC='@abs_srcdir@/ext/hivex/_hivex.c' +HIVEX_SRC='@srcdir@/ext/hivex/_hivex.c' CLEAN.include [ "@builddir@/ext/**/*.o", HIVEX_MODULE, "@builddir@/ext/**/depend" ] @@ -38,13 +38,13 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log", # 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)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/hivex; ruby #(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)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(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("@builddir@/ext/hivex") do + Dir::chdir(File::dirname(EXT_CONF)) do unless sh "make" $stderr.puts "make failed" break @@ -61,19 +61,19 @@ end task :test => :build RDOC_FILES = FileList[ - "@srcdir@/README.rdoc", - "@srcdir@/lib/**/*.rb", - "@srcdir@/ext/**/*.[ch]" + "README.rdoc", + "lib/**/*.rb", + "ext/**/*.[ch]" ] Rake::RDocTask.new do |rd| - rd.main = "@srcdir@/README.rdoc" + rd.main = "README.rdoc" rd.rdoc_dir = "doc/site/api" rd.rdoc_files.include(RDOC_FILES) end Rake::RDocTask.new(:ri) do |rd| - rd.main = "@srcdir@/README.rdoc" + rd.main = "README.rdoc" 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", "@srcdir@/README.rdoc", + "Rakefile", "COPYING", "README", "NEWS", "README.rdoc", "lib/**/*.rb", "ext/**/*.[ch]", "ext/**/MANIFEST", "ext/**/extconf.rb", "tests/**/*", |