From 538d48b9a10be1cfbfc87e76c5db1c7e689f3f57 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 9 Dec 2013 15:46:08 -0500
Subject: Use stock automake rules to install netconfig

Following guidelines in section 27.10 of the Automake manual,
with some help from section 9.3.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---
 doc/Makefile.am   | 10 +---------
 doc/etc_netconfig | 19 -------------------
 doc/netconfig     | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 doc/etc_netconfig
 create mode 100644 doc/netconfig

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e871ee6..cb78ff0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1 @@
-EXTRA_DIST = etc_netconfig
-
-install: install-am
-	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
-	cp -p $(srcdir)/etc_netconfig $(DESTDIR)/$(sysconfdir)/netconfig
-	chmod 0644 $(DESTDIR)/$(sysconfdir)/netconfig
-
-uninstall: uninstall-am
-	$(RM) $(DESTDIR)/$(sysconfdir)/netconfig
+dist_sysconf_DATA	= netconfig
diff --git a/doc/etc_netconfig b/doc/etc_netconfig
deleted file mode 100644
index effc67e..0000000
--- a/doc/etc_netconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# The network configuration file. This file is currently only used in
-# conjunction with the TI-RPC code in the libtirpc library.
-#
-# Entries consist of:
-#
-#       <network_id> <semantics> <flags> <protofamily> <protoname> \
-#               <device> <nametoaddr_libs>
-#
-# The <device> and <nametoaddr_libs> fields are always empty in this
-# implementation.
-#
-udp        tpi_clts      v     inet     udp     -       -
-tcp        tpi_cots_ord  v     inet     tcp     -       -
-udp6       tpi_clts      v     inet6    udp     -       -
-tcp6       tpi_cots_ord  v     inet6    tcp     -       -
-rawip      tpi_raw       -     inet      -      -       -
-local      tpi_cots_ord  -     loopback  -      -       -
-unix       tpi_cots_ord  -     loopback  -      -       -
diff --git a/doc/netconfig b/doc/netconfig
new file mode 100644
index 0000000..effc67e
--- /dev/null
+++ b/doc/netconfig
@@ -0,0 +1,19 @@
+#
+# The network configuration file. This file is currently only used in
+# conjunction with the TI-RPC code in the libtirpc library.
+#
+# Entries consist of:
+#
+#       <network_id> <semantics> <flags> <protofamily> <protoname> \
+#               <device> <nametoaddr_libs>
+#
+# The <device> and <nametoaddr_libs> fields are always empty in this
+# implementation.
+#
+udp        tpi_clts      v     inet     udp     -       -
+tcp        tpi_cots_ord  v     inet     tcp     -       -
+udp6       tpi_clts      v     inet6    udp     -       -
+tcp6       tpi_cots_ord  v     inet6    tcp     -       -
+rawip      tpi_raw       -     inet      -      -       -
+local      tpi_cots_ord  -     loopback  -      -       -
+unix       tpi_cots_ord  -     loopback  -      -       -
-- 
cgit v1.2.1