Merge pull request #2551 from bapt/freebsd_fixes

[i3/i3] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7bba241b3f340bf41e71bcfb7a6a0209c4e5d36a..c90e26c71ed2d83d3c205b6094a2d8662f57f847 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 @CODE_COVERAGE_RULES@
 
+echo-version:
+       @echo "@I3_VERSION@"
+
 bin_PROGRAMS = \
        i3 \
        i3bar/i3bar \
@@ -86,12 +89,12 @@ EXTRA_DIST = \
        libi3/README \
        $(asciidoc_MANS:.1=.man) \
        $(asciidoc_MANS:.1=.man) \
-       man/asciidoc.conf \
+       man/asciidoc.conf.in \
        DEPENDS \
        I3_VERSION \
        LICENSE \
        PACKAGE-MAINTAINER \
-       RELEASE-NOTES-4.12 \
+       RELEASE-NOTES-4.13 \
        generate-command-parser.pl \
        parser-specs/commands.spec \
        parser-specs/config.spec \
@@ -200,7 +203,7 @@ $(asciidoc_MANS): man/%.1: man/%.xml man/$(dirstamp)
        @stamp='$@'; $(MKDIR_P) "$${stamp%/*}"
 
 man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp)
-       $(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_srcdir)/man/asciidoc.conf -o $@ $<
+       $(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_builddir)/man/asciidoc.conf -o $@ $<
 
 $(pod_MANS): man/%.1: % man/$(dirstamp)
        $(AM_V_GEN) @PATH_POD2MAN@ --utf8 $< > $@