summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMartin Hurton <hurtonm@gmail.com>2010-02-10 17:14:21 +0100
committerMartin Hurton <hurtonm@gmail.com>2010-02-10 17:14:21 +0100
commit7cab423fc20e46f54fa561e51b566cc8a63ca5c1 (patch)
treefa926432b8392e7717b7fbc1ecaf973ba60cb970 /Makefile.am
parentbc9b7f1f54b9dcf754021f1f7eb766d71cc97f29 (diff)
parent354efc513fdb4096f8830e6c2e3e8f1311303e61 (diff)
Merge branch 'master' of github.com:sustrik/zeromq2
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 81d1598..8795e14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,8 @@ if BUILD_PERF
DIR_PERF = perf
endif
-if INSTALL_MAN
-DIR_MAN = man
-endif
-
-SUBDIRS = src $(DIR_MAN) $(DIR_PERF) devices bindings examples
-DIST_SUBDIRS = src man perf devices bindings examples
+SUBDIRS = src doc $(DIR_PERF) devices bindings examples
+DIST_SUBDIRS = src doc perf devices bindings examples
EXTRA_DIST = \
$(top_srcdir)/foreign/openpgm/@pgm2_basename@.tar.bz2 \