Browse Source

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.
gn-latest-20200428
Ludovic Courtès 8 years ago
parent
commit
a9424c0887
3 changed files with 19 additions and 14 deletions
  1. +3
    -1
      Makefile.am
  2. +1
    -1
      configure.ac
  3. +15
    -12
      doc.am

+ 3
- 1
Makefile.am View File

@ -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


+ 1
- 1
configure.ac View File

@ -7,7 +7,7 @@ AC_INIT([GNU Guix], [0.4], [bug-guix@gnu.org], [guix],
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \
color-tests parallel-tests])
color-tests parallel-tests -Woverride])
AC_CONFIG_SRCDIR([guix.scm])
AC_CONFIG_MACRO_DIR([m4])


doc/Makefile.am → doc.am View File


Loading…
Cancel
Save