diff options
| author | Dan McGee <dan@archlinux.org> | 2012-01-02 19:44:00 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-02 19:44:00 -0600 |
| commit | 6513b0ba591e44b4da75aa924046a34b8a269e9d (patch) | |
| tree | 47935e981488774741dcc4d8dc71d4a5ecef69ba /doc | |
| parent | 0b9cd9448c16dcf5e21ee8822698dbe908db520f (diff) | |
| parent | f1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (diff) | |
Merge branch 'maint'
Conflicts:
doc/Makefile.am
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c6cc50f..a2018c71 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -120,7 +120,7 @@ A2X_OPTS = \ --destination-dir='./' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt @@ -132,8 +132,8 @@ HACKING.html: ../HACKING sed -e 's/\r$$//' > $@ # Customizations for certain HTML docs -$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile -$(HTML_OTHER): asciidoc.conf Makefile +$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am +$(HTML_OTHER): asciidoc.conf Makefile.am %.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.8.html: ASCIIDOC_OPTS += -d manpage %.5.html: ASCIIDOC_OPTS += -d manpage |