From 4f3736162076419641a6225ac28b29d340020604 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@trick.home.annexia.org>
Date: Thu, 16 Jul 2009 17:52:59 +0100
Subject: [PATCH] More misc fixes for non-srcdir builds.

---
 fish/Makefile.am | 12 +++++++++---
 po/POTFILES.in   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 9ec0cf4..8c289dc 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -20,6 +20,8 @@ bin_PROGRAMS = guestfish
 EXTRA_DIST = \
 	rc_protocol.x
 
+CLEANFILES = rc_protocol.c rc_protocol.h
+
 guestfish_SOURCES = \
 	alloc.c \
 	cmds.c \
@@ -44,15 +46,19 @@ BUILT_SOURCES = \
 	rc_protocol.h
 
 guestfish_CFLAGS = \
-	-I$(top_srcdir)/src -I$(top_builddir)/src -Wall \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/fish -I$(top_builddir)/fish \
+	-Wall \
 	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
 guestfish_LDADD = $(top_builddir)/src/libguestfs.la $(LIBREADLINE)
 
 if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
-	rm -f $@-t
+	rm -f $@-t $@-t2
 	$(RPCGEN) -c -o $@-t $<
-	mv $@-t $@
+	sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+	rm $@-t
+	mv $@-t2 $@
 
 rc_protocol.h: rc_protocol.x
 	rm -f $@-t
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 60aeddc..26a72ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+build/fish/rc_protocol.c
 cat/virt-cat.pl
 daemon/augeas.c
 daemon/blockdev.c
@@ -58,7 +59,6 @@ fish/glob.c
 fish/lcd.c
 fish/more.c
 fish/rc.c
-fish/rc_protocol.c
 fish/reopen.c
 fish/tilde.c
 fish/time.c
-- 
1.8.3.1