Libguestfs - Dec 2011 - [PATCH] Fix rpcgen post-processing for out-of-tree builds

---
 fish/Makefile.am |    2 +-
 src/Makefile.am  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 6ca8a82..16a29b0 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -139,7 +139,7 @@ if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
 	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $<
-	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+	sed 's,\.\./\(\.\./\)*fish,.,' < $@-t > $@-t2
 	rm $@-t
 	mv $@-t2 $@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 82a4004..28a1b92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,7 @@ if HAVE_RPCGEN
 guestfs_protocol.c: guestfs_protocol.x
 	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $(srcdir)/$<
-	sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
+	sed 's,\.\./\(\.\./\)*src,.,' < $@-t > $@-t2
 	rm $@-t
 	mv $@-t2 $@
 
-- 
1.7.7.3

On Mon, Dec 05, 2011 at 06:35:57PM +0100, Hilko Bengen
wrote:
> ---
>  fish/Makefile.am |    2 +-
>  src/Makefile.am  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fish/Makefile.am b/fish/Makefile.am
> index 6ca8a82..16a29b0 100644
> --- a/fish/Makefile.am
> +++ b/fish/Makefile.am
> @@ -139,7 +139,7 @@ if HAVE_RPCGEN
>  rc_protocol.c: rc_protocol.x
>  	rm -f $@-t $@-t2
>  	$(RPCGEN) -c -o $@-t $<
> -	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
> +	sed 's,\.\./\(\.\./\)*fish,.,' < $@-t > $@-t2
>  	rm $@-t
>  	mv $@-t2 $@
>  
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 82a4004..28a1b92 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -171,7 +171,7 @@ if HAVE_RPCGEN
>  guestfs_protocol.c: guestfs_protocol.x
>  	rm -f $@-t $@-t2
>  	$(RPCGEN) -c -o $@-t $(srcdir)/$<
> -	sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
> +	sed 's,\.\./\(\.\./\)*src,.,' < $@-t > $@-t2
>  	rm $@-t
>  	mv $@-t2 $@
Thanks, I have applied and pushed this.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw