From 3485de717eac4923c2c40b07b5cca8ee554028b8 Mon Sep 17 00:00:00 2001 From: Jimmy Thrasher Date: Thu, 11 Feb 2016 13:26:08 -0500 Subject: [PATCH] Remove A2X variable from Makefile since it doesn't fix the OSX homebrew problem Per suggestion by @lenormf --- src/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 238cdba1..694bad1e 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 kak : $(objects) @@ -72,14 +67,14 @@ kak : $(objects) # Generate the man page ../doc/kak.1.gz: ../doc/kak.1.txt - $(A2X) --no-xmllint -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) --no-xmllint -f manpage $< + a2x --no-xmllint -f manpage $< sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \ -e "/^\.SH \"NAME\"/{N;d;}" $(@:.gz=.1) gzip -f $(@:.gz=.1)