aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-08-29 21:20:51 +0200
committerLudovic Courtès <ludo@gnu.org>2013-08-29 21:58:52 +0200
commita9424c0887f688e812e498a2556df4b1d9218268 (patch)
tree395f024c1dd65db7a393c9dbb906e548b9f41b2f /Makefile.am
parent88bd1804a25056591237c4163faeb4e42449244d (diff)
downloadguix-a9424c0887f688e812e498a2556df4b1d9218268.tar
guix-a9424c0887f688e812e498a2556df4b1d9218268.tar.gz
build: Build docs from the top-level Makefile.
This undoes commit 575ed8d ("doc: Create own Makefile.am in subdirectory."), and fixes a bug whereby "make pdf" or "make ps" wouldn't do anything. * doc/Makefile.am: Remove. * doc.am: New file. Use `-local' rules to build the image. * Makefile.am: Include it. * configure.ac: Use `-Woverride' to avoid undesired overridding of Automake rules.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1d68e6516a..bf9c1d0e91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,7 +186,9 @@ SUFFIXES = .go
guix_install_go_files = install-nobase_nodist_guilemoduleDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA
-SUBDIRS = doc po
+SUBDIRS = po
+
+include doc.am
if BUILD_DAEMON