make install fails when --prefix is used.

Moved the install rules for etc_netconfig into
its own doc/Makefile.am so $(DESTDIR) is defined
correctly when the --prefix configuration argument
is used.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 8c09ea876c87d2ac00add1070fa2683f74d15a3d..3e50d3caa1f95d52fbcb647bba506f9a1583e601 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,3 @@ nobase_include_HEADERS = tirpc/netconfig.h \
     
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = libtirpc.pc
-
-install-exec-local:
-       cp -p ./doc/etc_netconfig $(DESTDIR)/etc/netconfig
-       chmod 0644 $(DESTDIR)/etc/netconfig

diff --git a/configure.in b/configure.in
index d13df0b7c1840c4755011d004c39633ec6228d09..9312cb1b1563ad7532207da43157e7aa040afe2e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,5 +26,5 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netine
 AC_CHECK_LIB([pthread], [pthread_create])
 
 
-AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
 AC_OUTPUT(libtirpc.pc)

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..cc4fa76
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,5 @@
+
+install: install-am
+       $(mkinstalldirs) $(DESTDIR)/etc
+       cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig
+       chmod 0644 $(DESTDIR)/etc/netconfig