Install /var/lib/nfs files using DESTDIR and add rpcsec headers to distribution

	Add "$(DESTDIR)" to the paths for the "$(statedir)" files so they are
	put in the right place when DESTDIR is defined.

	Add the rpcsec header files to EXTRA_DIST list.

3 files changed, 74 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index a471e6c..29fce5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-27 Kevin Coffman <kwc@citi.umich.edu>
+	Install /var/lib/nfs files using DESTDIR and add rpcsec headers to distribution
+
+	Add "$(DESTDIR)" to the paths for the "$(statedir)" files so they are
+	put in the right place when DESTDIR is defined.
+
+	Add the rpcsec header files to EXTRA_DIST list.
+
 2005-12-21 NeilBrown <neilb@suse.de>
 	*utils/rquotad/rquota_server.c: Detect and handle both old-style
 	(2.4) and new-style(2.6) quotactl.
diff --git a/Makefile.am b/Makefile.am
index 09fd854..ff6f093 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,14 +37,36 @@ EXTRA_DIST = \
 	\
 	aclocal/nfs-utils.m4 \
 	aclocal/kerberos5.m4 \
-	aclocal/tcp-wrappers.m4
+	aclocal/tcp-wrappers.m4 \
+	\
+	support/rpc/include/rpc/auth_gss.h \
+	support/rpc/include/rpc/auth.h \
+	support/rpc/include/rpc/auth_unix.h \
+	support/rpc/include/rpc/clnt.h \
+	support/rpc/include/rpc/pmap_clnt.h \
+	support/rpc/include/rpc/pmap_prot.h \
+	support/rpc/include/rpc/pmap_rmt.h \
+	support/rpc/include/rpc/rpc_des.h \
+	support/rpc/include/rpc/rpc.h \
+	support/rpc/include/rpc/rpc_msg.h \
+	support/rpc/include/rpc/svc_auth.h \
+	support/rpc/include/rpc/svc.h \
+	support/rpc/include/rpc/types.h \
+	support/rpc/include/rpc/xdr.h
+
 
 install-data-hook:
-	if [ ! -d $(statedir) ]; then mkdir -p $(statedir); fi
-	touch $(statedir)/xtab; chmod 644 $(statedir)/xtab
-	touch $(statedir)/etab; chmod 644 $(statedir)/etab
-	touch $(statedir)/rmtab; chmod 644 $(statedir)/rmtab
-	mkdir -p $(statedir)/sm $(statedir)/sm.bak
-	touch $(statedir)/state
-	chmod go-rwx $(statedir)/sm $(statedir)/sm.bak $(statedir)/state
-	chown $(statduser) $(statedir)/sm $(statedir)/sm.bak $(statedir)/state
+	if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi
+	touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+	touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+	touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+	mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+	touch $(DESTDIR)$(statedir)/state
+	chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+	chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+
+uninstall-hook:
+	rm $(DESTDIR)$(statedir)/xtab
+	rm $(DESTDIR)$(statedir)/etab
+	rm $(DESTDIR)$(statedir)/rmtab
+	rm $(DESTDIR)$(statedir)/state
diff --git a/Makefile.in b/Makefile.in
index 8ae2b5f..a40a625 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,7 +243,22 @@ EXTRA_DIST = \
 	\
 	aclocal/nfs-utils.m4 \
 	aclocal/kerberos5.m4 \
-	aclocal/tcp-wrappers.m4
+	aclocal/tcp-wrappers.m4 \
+	\
+	support/rpc/include/rpc/auth_gss.h \
+	support/rpc/include/rpc/auth.h \
+	support/rpc/include/rpc/auth_unix.h \
+	support/rpc/include/rpc/clnt.h \
+	support/rpc/include/rpc/pmap_clnt.h \
+	support/rpc/include/rpc/pmap_prot.h \
+	support/rpc/include/rpc/pmap_rmt.h \
+	support/rpc/include/rpc/rpc_des.h \
+	support/rpc/include/rpc/rpc.h \
+	support/rpc/include/rpc/rpc_msg.h \
+	support/rpc/include/rpc/svc_auth.h \
+	support/rpc/include/rpc/svc.h \
+	support/rpc/include/rpc/types.h \
+	support/rpc/include/rpc/xdr.h
 
 all: all-recursive
 
@@ -427,7 +442,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/aclocal $(distdir)/debian
+	$(mkdir_p) $(distdir)/aclocal $(distdir)/debian $(distdir)/support/rpc/include/rpc
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -647,6 +662,8 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-info-am
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
 uninstall-info: uninstall-info-recursive
 
@@ -663,18 +680,25 @@ uninstall-info: uninstall-info-recursive
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	tags tags-recursive uninstall uninstall-am uninstall-hook \
+	uninstall-info-am
 
 
 install-data-hook:
-	if [ ! -d $(statedir) ]; then mkdir -p $(statedir); fi
-	touch $(statedir)/xtab; chmod 644 $(statedir)/xtab
-	touch $(statedir)/etab; chmod 644 $(statedir)/etab
-	touch $(statedir)/rmtab; chmod 644 $(statedir)/rmtab
-	mkdir -p $(statedir)/sm $(statedir)/sm.bak
-	touch $(statedir)/state
-	chmod go-rwx $(statedir)/sm $(statedir)/sm.bak $(statedir)/state
-	chown $(statduser) $(statedir)/sm $(statedir)/sm.bak $(statedir)/state
+	if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi
+	touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+	touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+	touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+	mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+	touch $(DESTDIR)$(statedir)/state
+	chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+	chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+
+uninstall-hook:
+	rm $(DESTDIR)$(statedir)/xtab
+	rm $(DESTDIR)$(statedir)/etab
+	rm $(DESTDIR)$(statedir)/rmtab
+	rm $(DESTDIR)$(statedir)/state
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: