diff options
| author | Steve Dickson <steved@redhat.com> | 2009-05-28 15:13:23 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2009-05-28 15:13:23 -0400 |
| commit | 639012fa65eb1a6814394033026771f785f016ac (patch) | |
| tree | c8040e75ff7ef473a5620a12ccd28ab0845ac5be | |
| parent | 018cb4ebd8ebd484eb6d755288dd21faed3c2be1 (diff) | |
| download | ti-rpc-639012fa65eb1a6814394033026771f785f016ac.tar.gz | |
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>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 8c09ea8..3e50d3c 100644 --- 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 d13df0b..9312cb1 100644 --- 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 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 |