From a9424c0887f688e812e498a2556df4b1d9218268 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 29 Aug 2013 21:20:51 +0200 Subject: 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. --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile.am') 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 -- cgit v1.2.3