Add doc/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e0e7da04db0135eb73988bdaabd3842f93900496..8bb0781ee7631a0630cab9e000d62cf08de5d8c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,18 +2,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @subdirs2@
+SUBDIRS = @subdirs2@ doc
 
 EXTRA_DIST =                   \
        fuse.pc.in              \
        README*                 \
        Filesystems             \
-       FAQ                     \
-       doc/how-fuse-works      \
-       doc/kernel.txt          \
-       doc/Doxyfile
-
-man_MANS = doc/fusermount.1 doc/mount.fuse.8 doc/ulockmgr_server.1
+       FAQ
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = fuse.pc

diff --git a/configure.in b/configure.in
index 1d7dd5c18bc7d6f9657c1bb85c482d173f755021..fc778564b5112950096764a6b6efdb14ff74571f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -111,7 +111,7 @@ if test "$arch" = linux -a "$cross_compiling" != "yes"; then
        fi
 fi
 
-AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])
+AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile])
 AC_OUTPUT
 
 if test "$util_linux_ok" = no; then

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..ebc9679
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in
+
+dist_man_MANS = fusermount.1 mount.fuse.8 ulockmgr_server.1
+
+EXTRA_DIST = how-fuse-works kernel.txt Doxyfile