From ab390a02dc415d7a9d1cfe999cd7ddc683e6aef8 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somasis.com>
Date: Fri, 17 Nov 2017 00:32:30 -0500
Subject: [PATCH 1/2] Makefile: use PKG_CONFIG, not pkg-config

---
 src/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 534db36e..50dc32b5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,6 +17,8 @@ sources := $(sort $(wildcard *.cc))
 objects := $(addprefix ., $(sources:.cc=$(suffix).o))
 deps := $(addprefix ., $(sources:.cc=$(suffix).d))
 
+PKG_CONFIG ?= pkg-config
+
 PREFIX ?= /usr/local
 DESTDIR ?= # root dir
 
@@ -45,8 +47,8 @@ else ifneq (,$(findstring CYGWIN,$(os)))
     CPPFLAGS += -D_XOPEN_SOURCE=700
     LIBS += -lncursesw -ldbghelp
 else
-    LIBS += $(shell pkg-config --libs ncursesw)
-    CPPFLAGS += $(shell pkg-config --cflags ncursesw)
+    LIBS += $(shell $(PKG_CONFIG) --libs ncursesw)
+    CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw)
     LDFLAGS += -rdynamic
 endif
 

From 3e1a4df3fb7c761cfb5d16f1a823ae52877a0de2 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somasis.com>
Date: Fri, 17 Nov 2017 23:10:08 -0500
Subject: [PATCH 2/2] Makefile: Add ability to disable compressing manpage

Some distributions don't compress them.
---
 .gitignore   |  1 +
 src/Makefile | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6fb2189..9119351a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 src/kak
 src/kak.debug
 src/kak.opt
+doc/kak.1
 doc/kak.1.gz
 doc/manpages/*.gz
 tags
diff --git a/src/Makefile b/src/Makefile
index 50dc32b5..bd1f259f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,12 @@
 debug ?= yes
 static ?= no
+gzip_man ?= yes
+
+ifneq ($(gzip_man),yes)
+    ifneq ($(gzip_man),no)
+        $(error gzip_man should be either yes or no)
+    endif
+endif
 
 ifeq ($(debug),yes)
     CPPFLAGS += -DKAK_DEBUG
@@ -73,9 +80,16 @@ kak$(suffix) : $(objects)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -MP -MF $(addprefix ., $(<:.cc=$(suffix).d)) -c -o $@ $<
 
 # Generate the man page
+ifeq ($(gzip_man),yes)
 ../doc/kak.1.gz: ../doc/kak.1.txt
 	a2x --no-xmllint -f manpage $<
 	gzip -n -9 -f $(basename $<)
+man: ../doc/kak.1.gz
+else
+../doc/kak.1: ../doc/kak.1.txt
+	a2x --no-xmllint -f manpage $<
+man: ../doc/kak.1
+endif
 
 check: test
 test:
@@ -84,14 +98,13 @@ test:
 TAGS: tags
 tags:
 	ctags -R
-man: ../doc/kak.1.gz
 
 clean:
 	rm -f .*.o .*.d
 
 distclean: clean
 	rm -f kak kak$(suffix)
-	find ../doc -type f -name \*\\.gz -exec rm -f '{}' +
+	find ../doc -type f \( -name \*\\.gz -o -name \*\\.1 \) -exec rm -f '{}' +
 
 installdirs:
 	install -d $(bindir) \
@@ -113,7 +126,11 @@ install: kak man installdirs
 	[ -e $(sharedir)/autoload ] || ln -s rc $(sharedir)/autoload
 	install -m 0644 ../colors/* $(sharedir)/colors
 	install -m 0644 ../README.asciidoc $(docdir)
+ifeq ($(gzip_man),yes)
 	install -m 0644 ../doc/kak.1.gz $(mandir)
+else
+	install -m 0644 ../doc/kak.1 $(mandir)
+endif
 
 install-strip: install
 	strip -s $(bindir)/kak
@@ -122,7 +139,8 @@ uninstall:
 	rm -rf $(bindir)/kak \
 		$(sharedir) \
 		$(docdir) \
-		$(mandir)/kak.1.gz
+		$(mandir)/kak.1.gz \
+		$(mandir)/kak.1
 
 .PHONY: check TAGS clean distclean installdirs install install-strip uninstall
 .PHONY: tags test man kak