xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jjthrash/osx-asciidoc-fixes'

Browse Source
This commit is contained in:
Maxime Coste 2016-02-11 22:09:52 +00:00
commit b365ee3bc3
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/kakoune.rb
View File

@ -5,6 +5,7 @@ class Kakoune < Formula
head "https://github.com/mawww/kakoune.git" head "https://github.com/mawww/kakoune.git"
depends_on 'boost' depends_on 'boost'
depends_on 'asciidoc'
def install def install
cd 'src' do cd 'src' do

11
src/Makefile
View File

@ -37,7 +37,6 @@ os := $(shell uname)
ifeq ($(os),Darwin) ifeq ($(os),Darwin)
LIBS += -lncurses -lboost_regex-mt LIBS += -lncurses -lboost_regex-mt
A2X ?= a2x.py
else ifeq ($(os),FreeBSD) else ifeq ($(os),FreeBSD)
LIBS += -ltinfow -lncursesw -lboost_regex LIBS += -ltinfow -lncursesw -lboost_regex
CPPFLAGS += -I/usr/local/include CPPFLAGS += -I/usr/local/include
@ -56,10 +55,6 @@ else
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
endif 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 CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
kak : $(objects) kak : $(objects)
@ -72,16 +67,16 @@ kak : $(objects)
# Generate the man page # Generate the man page
../doc/kak.1.gz: ../doc/kak.1.txt ../doc/kak.1.gz: ../doc/kak.1.txt
$(A2X) -f manpage $< a2x --no-xmllint -f manpage $<
gzip -f $(basename $<) gzip -f $(basename $<)
# Generate the editor's documentation pages # Generate the editor's documentation pages
# Since `a2x` won't generate man pages if some sections are missing (which we don't need), # 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 # we generate the pages, patch them and then compress them
../doc/manpages/%.gz: ../doc/manpages/%.asciidoc ../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 $<))\"," \ 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) gzip -f $(@:.gz=.1)
mv $(@:.gz=.1.gz) $@ mv $(@:.gz=.1.gz) $@