diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2016-02-11 22:09:52 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2016-02-11 22:09:52 +0000 |
| commit | b365ee3bc3fe34cc6bb38ef39e94ea4ffaec9ab9 (patch) | |
| tree | 3c35ec4568f756ceb36c32b4511d3fb05059b4ce /src | |
| parent | 986c91a8356bc0fb3dcff97479b167a4c8326d80 (diff) | |
| parent | fd15158cf3d17a785bd8bf68df2137d2f67473e7 (diff) | |
Merge remote-tracking branch 'jjthrash/osx-asciidoc-fixes'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index 7ed136e2..cb1a80c0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,7 +37,6 @@ os := $(shell uname) ifeq ($(os),Darwin) LIBS += -lncurses -lboost_regex-mt - A2X ?= a2x.py else ifeq ($(os),FreeBSD) LIBS += -ltinfow -lncursesw -lboost_regex CPPFLAGS += -I/usr/local/include @@ -56,10 +55,6 @@ else LDFLAGS += -rdynamic endif -# The `a2x` tool is used as-is (`a2x.py`) in some distributions, or as a symlink in others (`a2x` → `a2x.py`) -# Picking the right name is done in the system detection switch above -A2X ?= a2x - CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address kak : $(objects) @@ -72,16 +67,16 @@ kak : $(objects) # Generate the man page ../doc/kak.1.gz: ../doc/kak.1.txt - $(A2X) -f manpage $< + a2x --no-xmllint -f manpage $< gzip -f $(basename $<) # Generate the editor's documentation pages # Since `a2x` won't generate man pages if some sections are missing (which we don't need), # we generate the pages, patch them and then compress them ../doc/manpages/%.gz: ../doc/manpages/%.asciidoc - $(A2X) -f manpage $< + a2x --no-xmllint -f manpage $< sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \ - -e "/^\.SH \"NAME\"/,+1d" $(@:.gz=.1) + -e "/^\.SH \"NAME\"/{N;d;}" $(@:.gz=.1) gzip -f $(@:.gz=.1) mv $(@:.gz=.1.gz) $@ |