From cca6171e5536195417bc3d0e887c1ec88424172d Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 7 Jan 2017 22:38:30 +0100 Subject: [PATCH] Properly install man pages. --- util/amisc/build.lua | 2 +- util/arch/build.lua | 2 +- util/misc/build.lua | 56 ++------------------------------------------ 3 files changed, 4 insertions(+), 56 deletions(-) diff --git a/util/amisc/build.lua b/util/amisc/build.lua index 1d856f197..22fa396cf 100644 --- a/util/amisc/build.lua +++ b/util/amisc/build.lua @@ -15,7 +15,7 @@ local function simpleprogram(name) name = name.."-pkg", map = { ["$(INSDIR)/bin/"..name] = "+"..name, - ["$(PLATIND)/man/man1/"..name..".1"] = "./"..name..".1", + ["$(INSDIR)/share/man/man1/"..name..".1"] = "./"..name..".1", } } end diff --git a/util/arch/build.lua b/util/arch/build.lua index 54b05f981..160b9c21f 100644 --- a/util/arch/build.lua +++ b/util/arch/build.lua @@ -17,6 +17,6 @@ installable { name = "pkg", map = { ["$(INSDIR)/bin/aal"] = "+aal", - ["$(PLATIND)/man/man1/aal.1"] = "./aal.1" + ["$(INSDIR)/share/man/man1/aal.1"] = "./aal.1" } } diff --git a/util/misc/build.lua b/util/misc/build.lua index dd207bbbc..e8dfbca33 100644 --- a/util/misc/build.lua +++ b/util/misc/build.lua @@ -41,59 +41,7 @@ installable { ["$(PLATDEP)/em_encode"] = "+encode", ["$(PLATDEP)/em_decode"] = "+decode", ["$(INSDIR)/bin/esize"] = "+esize", - ["$(PLATIND)/man/man1/esize.1"] = "./esize.1", - ["$(PLATIND)/man/man6/em_decode.6"] = "./em_decode.6" + ["$(INSDIR)/share/man/man1/esize.1"] = "./esize.1", + ["$(INSDIR)/share/man/man6/em_decode.6"] = "./em_decode.6" } } - ---[[ -D := util/misc - -define build-misc-impl - $(call reset) - $(call cfile, $D/esize.c) - $(call cprogram, $(BINDIR)/esize) - $(call installto, $(INSDIR)/bin/esize) - - $(call reset) - $(eval q := $D/esize.1) - $(call installto, $(INSDIR)/share/man/man1/esize.1) - - $(call reset) - $(eval objdir := encode) - $(call cfile, $D/convert.c) - $(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h) - $(call rawfile, $(LIBREAD_EMEV)) - $(call rawfile, $(LIBEMK)) - $(call rawfile, $(LIBEM_DATA)) - $(call rawfile, $(LIBALLOC)) - $(call rawfile, $(LIBPRINT)) - $(call rawfile, $(LIBSTRING)) - $(call rawfile, $(LIBSYSTEM)) - $(call cprogram, $(BINDIR)/em_encode) - $(call installto, $(PLATDEP)/em_encode) - $(eval EM_ENCODE := $o) - $(eval ACK_CORE_TOOLS += $o) - - $(call reset) - $(eval objdir := decode) - $(call cfile, $D/convert.c) - $(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h) - $(call rawfile, $(LIBREAD_EMKV)) - $(call rawfile, $(LIBEME)) - $(call rawfile, $(LIBEM_DATA)) - $(call rawfile, $(LIBALLOC)) - $(call rawfile, $(LIBPRINT)) - $(call rawfile, $(LIBSTRING)) - $(call rawfile, $(LIBSYSTEM)) - $(call cprogram, $(BINDIR)/em_decode) - $(call installto, $(PLATDEP)/em_decode) - $(eval EM_DECODE := $o) - - $(call reset) - $(eval q := $D/em_decode.6) - $(call installto, $(INSDIR)/share/man/man6/em_decode.6) -endef - -$(eval $(build-misc-impl)) ---]]