Merge branch 'upstream'

[nfs-utils.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff6f09301ac72eff3aa13a5efd3e8e4bb49506c1..ae7cd16519648d2664958fc4de6483bf6bd266d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tools support utils linux-nfs
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = tools support utils linux-nfs tests
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -35,25 +37,17 @@ EXTRA_DIST = \
        debian/nhfsstone.prerm \
        debian/rules \
        \
+       aclocal/bsdsignals.m4 \
        aclocal/nfs-utils.m4 \
        aclocal/kerberos5.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
+       aclocal/libtirpc.m4 \
+       aclocal/libevent.m4 \
+       aclocal/libnfsidmap.m4 \
+       aclocal/rpcsec_vers.m4 \
+       aclocal/ipv6.m4
 
+ACLOCAL_AMFLAGS = -I aclocal
 
 install-data-hook:
        if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi
@@ -63,7 +57,7 @@ install-data-hook:
        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
+       -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
 
 uninstall-hook:
        rm $(DESTDIR)$(statedir)/xtab