From 3f00fa484d95cd3a4824d10f6b1d1cb128e2699b Mon Sep 17 00:00:00 2001 From: Hilko Bengen Date: Mon, 5 Dec 2011 18:35:57 +0100 Subject: [PATCH] Fix rpcgen post-processing for out-of-tree builds (cherry picked from commit 43942b08cfbcf91bef29ec532f3d097a8519c982) --- 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.8.3.1