[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 1/4] out-of-tree build: don't distribute extconf.rb.in template, use generated exconf.rb



Apparently, the file will only be autogenerated in $(builddir) if it
is not already present in $(srcdir).
---
 ruby/Makefile.am               |    1 -
 ruby/Rakefile.in               |    2 +-
 ruby/ext/guestfs/extconf.rb.in |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 5b755e5..2ecb6a8 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST = \
 	Rakefile.in \
 	README.rdoc \
 	doc/site/index.html \
-	ext/guestfs/extconf.rb \
 	lib/guestfs.rb \
 	run-bindtests \
 	run-ruby-tests \
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index f832abd..a74e191 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -39,7 +39,7 @@ end
 PKG_NAME='@PACKAGE_NAME@'
 PKG_VERSION='@PACKAGE_VERSION@'
 
-EXT_CONF='@abs_srcdir@/ext/guestfs/extconf.rb'
+EXT_CONF='@abs_builddir@/ext/guestfs/extconf.rb'
 MAKEFILE='@builddir@/ext/guestfs/Makefile'
 GUESTFS_MODULE='@builddir@/ext/guestfs/_guestfs.so'
 GUESTFS_SRC='@srcdir@/ext/guestfs/_guestfs.c'
diff --git a/ruby/ext/guestfs/extconf.rb.in b/ruby/ext/guestfs/extconf.rb.in
index e358551..b8bd74a 100644
--- a/ruby/ext/guestfs/extconf.rb.in
+++ b/ruby/ext/guestfs/extconf.rb.in
@@ -34,4 +34,4 @@ $CFLAGS =
   "@WARN_CFLAGS@ @WERROR_CFLAGS@"
 
 create_header
-create_makefile(extension_name)
+create_makefile(extension_name, "@abs_srcdir@")
-- 
1.7.10.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]