diff -aruN a/support/export/Makefile.am b/support/export/Makefile.am
--- a/support/export/Makefile.am	2010-02-18 04:35:00.000000000 -0800
+++ b/support/export/Makefile.am	2010-09-08 08:37:07.000000000 -0700
@@ -32,10 +32,16 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
diff -aruN a/support/export/Makefile.in b/support/export/Makefile.in
--- a/support/export/Makefile.in	2010-02-18 04:36:42.000000000 -0800
+++ b/support/export/Makefile.in	2010-09-08 08:39:35.000000000 -0700
@@ -66,7 +66,7 @@
 	hostname.$(OBJEXT) nfsctl.$(OBJEXT) rmtab.$(OBJEXT) \
 	xtab.$(OBJEXT) mount_clnt.$(OBJEXT) mount_xdr.$(OBJEXT)
 libexport_a_OBJECTS = $(am_libexport_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -561,10 +561,16 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
diff -aruN a/support/misc/Makefile.in b/support/misc/Makefile.in
--- a/support/misc/Makefile.in	2010-02-18 04:36:43.000000000 -0800
+++ b/support/misc/Makefile.in	2010-09-08 08:41:35.000000000 -0700
@@ -63,7 +63,7 @@
 am_libmisc_a_OBJECTS = tcpwrapper.$(OBJEXT) from_local.$(OBJEXT) \
 	mountpoint.$(OBJEXT)
 libmisc_a_OBJECTS = $(am_libmisc_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/support/nfs/Makefile.in b/support/nfs/Makefile.in
--- a/support/nfs/Makefile.in	2010-02-18 04:36:43.000000000 -0800
+++ b/support/nfs/Makefile.in	2010-09-08 08:42:13.000000000 -0700
@@ -68,7 +68,7 @@
 	cacheio.$(OBJEXT) closeall.$(OBJEXT) nfs_mntent.$(OBJEXT) \
 	conffile.$(OBJEXT) svc_create.$(OBJEXT)
 libnfs_a_OBJECTS = $(am_libnfs_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/support/nsm/Makefile.am b/support/nsm/Makefile.am
--- a/support/nsm/Makefile.am	2010-02-18 04:35:00.000000000 -0800
+++ b/support/nsm/Makefile.am	2010-09-08 08:53:09.000000000 -0700
@@ -25,14 +25,23 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -m -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
diff -aruN a/support/nsm/Makefile.in b/support/nsm/Makefile.in
--- a/support/nsm/Makefile.in	2010-02-18 04:36:43.000000000 -0800
+++ b/support/nsm/Makefile.in	2010-09-08 08:55:28.000000000 -0700
@@ -68,7 +68,7 @@
 	$(am__objects_4)
 am_libnsm_a_OBJECTS = $(am__objects_5) file.$(OBJEXT) rpc.$(OBJEXT)
 libnsm_a_OBJECTS = $(am_libnsm_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -549,14 +549,23 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -m -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
diff -aruN a/utils/exportfs/Makefile.in b/utils/exportfs/Makefile.in
--- a/utils/exportfs/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/exportfs/Makefile.in	2010-09-08 08:57:20.000000000 -0700
@@ -66,7 +66,7 @@
 exportfs_DEPENDENCIES = ../../support/export/libexport.a \
 	../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/utils/mount/Makefile.in b/utils/mount/Makefile.in
--- a/utils/mount/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/mount/Makefile.in	2010-09-08 09:09:06.000000000 -0700
@@ -77,7 +77,7 @@
 mount_nfs_OBJECTS = $(am_mount_nfs_OBJECTS)
 mount_nfs_DEPENDENCIES = ../../support/nfs/libnfs.a \
 	../../support/export/libexport.a
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/utils/mountd/Makefile.in b/utils/mountd/Makefile.in
--- a/utils/mountd/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/mountd/Makefile.in	2010-09-08 08:58:58.000000000 -0700
@@ -70,7 +70,7 @@
 	../../support/nfs/libnfs.a ../../support/misc/libmisc.a \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/utils/nfsd/Makefile.in b/utils/nfsd/Makefile.in
--- a/utils/nfsd/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/nfsd/Makefile.in	2010-09-08 09:00:19.000000000 -0700
@@ -62,7 +62,7 @@
 am_nfsd_OBJECTS = nfsd.$(OBJEXT) nfssvc.$(OBJEXT)
 nfsd_OBJECTS = $(am_nfsd_OBJECTS)
 nfsd_DEPENDENCIES = ../../support/nfs/libnfs.a
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/utils/showmount/Makefile.in b/utils/showmount/Makefile.in
--- a/utils/showmount/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/showmount/Makefile.in	2010-09-08 09:03:56.000000000 -0700
@@ -63,7 +63,7 @@
 showmount_OBJECTS = $(am_showmount_OBJECTS)
 showmount_DEPENDENCIES = ../../support/export/libexport.a \
 	../../support/nfs/libnfs.a ../../support/misc/libmisc.a
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
diff -aruN a/utils/statd/Makefile.am b/utils/statd/Makefile.am
--- a/utils/statd/Makefile.am	2010-02-18 04:35:00.000000000 -0800
+++ b/utils/statd/Makefile.am	2010-09-08 08:36:26.000000000 -0700
@@ -33,14 +33,23 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -m -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
diff -aruN a/utils/statd/Makefile.in b/utils/statd/Makefile.in
--- a/utils/statd/Makefile.in	2010-02-18 04:36:44.000000000 -0800
+++ b/utils/statd/Makefile.in	2010-09-08 09:06:52.000000000 -0700
@@ -99,7 +99,7 @@
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 SCRIPTS = $(dist_sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include -I$(top_srcdir)/support/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -732,14 +732,23 @@
 $(GENFILES_CLNT): %_clnt.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -l -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_SVC): %_svc.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -m -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true
 	$(RPCGEN) -c -o $@ $<
+	$(SED) "s,$(abs_srcdir),$(abs_builddir),g" < $@ > $@.N
+	rm -f $@
+	mv -f $@.N $@
 
 $(GENFILES_H): %.h: %.x $(RPCGEN)
 	test -f $@ && rm -rf $@ || true