aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-01-26 17:44:35 +0100
committerMiklos Szeredi <mszeredi@suse.cz>2012-01-26 17:44:35 +0100
commitcd0ad2cf01b18dd1cf45c687dadf820e3b63be94 (patch)
tree6401ebab5fe1382dc9491ce4d011c44f134e8835
parent179c677f25a22fbb6ec27a1163ad17e6430854b0 (diff)
downloadandroid_external_fuse-cd0ad2cf01b18dd1cf45c687dadf820e3b63be94.tar.gz
android_external_fuse-cd0ad2cf01b18dd1cf45c687dadf820e3b63be94.tar.bz2
android_external_fuse-cd0ad2cf01b18dd1cf45c687dadf820e3b63be94.zip
Add doc/Makefile.am
-rw-r--r--Makefile.am9
-rw-r--r--configure.in2
-rw-r--r--doc/Makefile.am5
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index e0e7da0..8bb0781 100644
--- 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 1d7dd5c..fc77856 100644
--- 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
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