3 files changed, 18 insertions, 15 deletions
diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile
deleted file mode 100644
index 9f861a56..00000000
--- a/doc/manuals/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ..
-
-ASCIIDOC = osmocombb-usermanual.adoc
-ASCIIDOC_DEPS = chapters/*.adoc
-include $(TOPDIR)/build/Makefile.asciidoc.inc
-
-include $(TOPDIR)/build/Makefile.common.inc
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
new file mode 100644
index 00000000..61ccafab
--- /dev/null
+++ b/doc/manuals/Makefile.am
@@ -0,0 +1,10 @@
+OSMO_GSM_MANUALS_DIR = $(top_srcdir)
+EXTRA_DIST = osmocombb-usermanual.adoc \
+	osmocombb-usermanual-docinfo.xml \
+	chapters
+
+ASCIIDOC = osmocombb-usermanual.adoc
+ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
+
+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
diff --git a/doc/manuals/osmocombb-usermanual.adoc b/doc/manuals/osmocombb-usermanual.adoc
index b4059348..024fc79a 100644
--- a/doc/manuals/osmocombb-usermanual.adoc
+++ b/doc/manuals/osmocombb-usermanual.adoc
@@ -3,19 +3,19 @@ OsmocomBB User Manual
 Holger Hans Peter Freyther <holger@moiji-mobile.com>
 
 
-include::../common/chapters/preface.adoc[]
+include::./common/chapters/preface.adoc[]
 
-include::chapters/scripting.adoc[]
+include::{srcdir}/chapters/scripting.adoc[]
 
-include::../common/chapters/vty.adoc[]
+include::./common/chapters/vty.adoc[]
 
-include::../common/chapters/logging.adoc[]
+include::./common/chapters/logging.adoc[]
 
 
-include::../common/chapters/port_numbers.adoc[]
+include::./common/chapters/port_numbers.adoc[]
 
-include::../common/chapters/bibliography.adoc[]
+include::./common/chapters/bibliography.adoc[]
 
-include::../common/chapters/glossary.adoc[]
+include::./common/chapters/glossary.adoc[]
 
-include::../common/chapters/gfdl.adoc[]
+include::./common/chapters/gfdl.adoc[]