1 files changed, 7 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 30cc02bc9..90d2f4c60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 # only documentation (ALL of the documentation)
 if DOCUMENTATION_ONLY
-  SUBDIRS = bin doc
+  SUBDIRS = scripts doc
 else
-  SUBDIRS = m4 bin src po pkgconfig
+  SUBDIRS = m4 scripts src po pkgconfig
 endif
 
 # documentation on / off switch (affects all of the documentation)
@@ -13,12 +13,7 @@ if DOCUMENTATION
   SUBDIRS += doc
 endif
 
-# only manpages, needs "doc" subdir
-if INCLUDE_MANPAGES
-  SUBDIRS += doc
-endif
-
-SUBDIRS += contrib
+SUBDIRS += contrib data scripts
 
 EXTRA_DIST = \
  ABOUT-NLS \
@@ -28,7 +23,7 @@ EXTRA_DIST = \
  .version
 
 gnunetincludedir = $(includedir)/gnunet
-gnunetinclude_HEADERS = gnunet_config.h
+#gnunetinclude_HEADERS = gnunet_config.h
 
 docdir = $(datadir)/doc/gnunet/
 doc_DATA = COPYING README
@@ -77,10 +72,10 @@ endif
 gana: gana-gns gana-gnunet-signatures
 
 gana-gns:
-        @cd $(top_srcdir)/contrib/gana/gnu-name-system-record-types; make; cp gnu_name_system_record_types.h ../../../src/include/
-        @cd $(top_srcdir)/contrib/gana/gnu-name-system-default-tlds; make; cp tlds.conf ../../../src/gns
+        @cd $(top_srcdir)/src/gana/gnu-name-system-record-types; make; cp gnu_name_system_record_types.h ../../../src/include/
+        @cd $(top_srcdir)/src/gana/gnu-name-system-default-tlds; make; cp tlds.conf ../../../src/gns
 
 gana-gnunet-signatures:
-        @cd $(top_srcdir)/contrib/gana/gnunet-signatures; make; cp gnunet_signatures.h ../../../src/include
+        @cd $(top_srcdir)/src/gana/gnunet-signatures; make; cp gnunet_signatures.h ../../../src/include