Libguestfs - Jan 2014 - [PATCH 1/2] hivex: ruby: find files to install in correct directories when building out-of-tree

---
 ruby/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index b6654d3..e78ab59 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -51,7 +51,7 @@ RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts
RbConfig::CONFIG['sitearchd
 install:
 	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
 	$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
-	$(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
-	$(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_SITEARCH)
+	$(INSTALL) -p -m 0644 ${srcdir}/lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
+	$(INSTALL) -p -m 0755 ${builddir}/ext/hivex/_hivex.so
$(DESTDIR)$(RUBY_SITEARCH)
 
 endif
-- 
1.8.5.2

Otherwise we get "Can't open ..." warnings which don't seem to
be fatal.
---
 regedit/Makefile.am | 2 +-
 sh/Makefile.am      | 4 ++--
 xml/Makefile.am     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/regedit/Makefile.am b/regedit/Makefile.am
index 7977334..476c059 100644
--- a/regedit/Makefile.am
+++ b/regedit/Makefile.am
@@ -39,6 +39,6 @@ $(top_builddir)/html/hivexregedit.1.html: hivexregedit
 	  --css 'pod.css' \
 	  --htmldir html \
 	  --outfile html/hivexregedit.1.html \
-	  regedit/hivexregedit
+	  $(abs_srcdir)/hivexregedit
 
 CLEANFILES = $(man_MANS)
diff --git a/sh/Makefile.am b/sh/Makefile.am
index a6f5ae6..1c2aba8 100644
--- a/sh/Makefile.am
+++ b/sh/Makefile.am
@@ -71,7 +71,7 @@ $(top_builddir)/html/hivexget.1.html: hivexget.pod
 	  --css 'pod.css' \
 	  --htmldir html \
 	  --outfile html/hivexget.1.html \
-	  sh/hivexget.pod
+	  $(abs_srcdir)/hivexget.pod
 
 $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
 	mkdir -p $(top_builddir)/html
@@ -79,6 +79,6 @@ $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
 	  --css 'pod.css' \
 	  --htmldir html \
 	  --outfile html/hivexsh.1.html \
-	  sh/hivexsh.pod
+	  $(abs_srcdir)/hivexsh.pod
 
 CLEANFILES = $(man_MANS)
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 67ba248..ca3f964 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -51,6 +51,6 @@ $(top_builddir)/html/hivexml.1.html: hivexml.pod
 	  --css 'pod.css' \
 	  --htmldir html \
 	  --outfile html/hivexml.1.html \
-	  xml/hivexml.pod
+	  $(abs_srcdir)/hivexml.pod
 
 CLEANFILES = $(man_MANS)
-- 
1.8.5.2

On Thu, Jan 16, 2014 at 08:22:59AM +0100, Hilko Bengen
wrote:
> Otherwise we get "Can't open ..." warnings which don't
seem to be fatal.
> ---
>  regedit/Makefile.am | 2 +-
>  sh/Makefile.am      | 4 ++--
>  xml/Makefile.am     | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/regedit/Makefile.am b/regedit/Makefile.am
> index 7977334..476c059 100644
> --- a/regedit/Makefile.am
> +++ b/regedit/Makefile.am
> @@ -39,6 +39,6 @@ $(top_builddir)/html/hivexregedit.1.html: hivexregedit
>  	  --css 'pod.css' \
>  	  --htmldir html \
>  	  --outfile html/hivexregedit.1.html \
> -	  regedit/hivexregedit
> +	  $(abs_srcdir)/hivexregedit
>  
>  CLEANFILES = $(man_MANS)
> diff --git a/sh/Makefile.am b/sh/Makefile.am
> index a6f5ae6..1c2aba8 100644
> --- a/sh/Makefile.am
> +++ b/sh/Makefile.am
> @@ -71,7 +71,7 @@ $(top_builddir)/html/hivexget.1.html: hivexget.pod
>  	  --css 'pod.css' \
>  	  --htmldir html \
>  	  --outfile html/hivexget.1.html \
> -	  sh/hivexget.pod
> +	  $(abs_srcdir)/hivexget.pod
>  
>  $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
>  	mkdir -p $(top_builddir)/html
> @@ -79,6 +79,6 @@ $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
>  	  --css 'pod.css' \
>  	  --htmldir html \
>  	  --outfile html/hivexsh.1.html \
> -	  sh/hivexsh.pod
> +	  $(abs_srcdir)/hivexsh.pod
>  
>  CLEANFILES = $(man_MANS)
> diff --git a/xml/Makefile.am b/xml/Makefile.am
> index 67ba248..ca3f964 100644
> --- a/xml/Makefile.am
> +++ b/xml/Makefile.am
> @@ -51,6 +51,6 @@ $(top_builddir)/html/hivexml.1.html: hivexml.pod
>  	  --css 'pod.css' \
>  	  --htmldir html \
>  	  --outfile html/hivexml.1.html \
> -	  xml/hivexml.pod
> +	  $(abs_srcdir)/hivexml.pod
>  
>  CLEANFILES = $(man_MANS)
ACK to both of these patches.

Thanks,

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org