doc: chapters/user.texi: Some fixes, some improvements.

[oweals/gnunet.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 386548505efa204f958d638263956461afa56b96..567e7b5ff0c24e3dae97631d06ec897983e4e629 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,22 @@
-INCLUDES = -I$(top_srcdir)/src/include
-SUBDIRS  = contrib m4 src po pkgconfig
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+SUBDIRS  = doc m4 src po pkgconfig
+
+if !TALER_ONLY
+  SUBDIRS += contrib
+endif
 
 EXTRA_DIST = \
  ABOUT-NLS \
  config.rpath \
  install-sh \
- HACKING \
  acinclude.m4
 
+gnunetincludedir = $(includedir)/gnunet
+gnunetinclude_HEADERS = gnunet_config.h
+
+docdir = $(datadir)/doc/gnunet/
+doc_DATA = COPYING README
+
 ACLOCAL_AMFLAGS = -I m4