From 3ba695edbd4a66a4eebb1d263f689742700214ea Mon Sep 17 00:00:00 2001 From: Olaf Schulz Date: Wed, 19 Dec 2018 11:13:50 +0100 Subject: [PATCH] Shift man-page from 'debian' into 'man' Change suggested in #5. --- Makefile | 17 +++++++++++++---- debian/manpages | 2 +- {debian => man}/neo_layout_viewer.1 | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) rename {debian => man}/neo_layout_viewer.1 (98%) diff --git a/Makefile b/Makefile index 45c853a..e55dd38 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ info: " none: Disables icon$(NL)$(NL)" \ " Use 'BUILD_TYPE=[release|debug] make' to switch build type$(NL)$(NL)" \ -src/version.vala: gen_version +src/version.vala: Makefile gen_version gen_version: @/bin/echo -e "namespace NeoLayoutViewer{$(NL)" \ @@ -170,11 +170,18 @@ build_release2: $(SRC) "$(BINDIR)" gcc $(SRC:.vala=.c) $(CC_INCLUDES) -o "$(BINDIR)/$(BINNAME)$(BINEXT)" \ `pkg-config --cflags --libs gtk+-3.0 gee-$(GEEVERSION) unique-3.0` -install: +man: man/neo_layout_viewer.1.gz + +man/%.gz: man/% + gzip -c "$<" > "$@" + +install: man test -f "$(BINDIR)/$(BINNAME)$(BINEXT)" || make all install -d $(EXEC_PREFIX)/bin install -D -m 0755 "$(BINDIR)/$(BINNAME)$(BINEXT)" "$(EXEC_PREFIX)/bin" - $(foreach ASSET_FILE,$(ASSET_FILES), install -D -m 0644 $(ASSET_FILE) "$(DATADIR)/$(APPNAME)/$(ASSET_FILE)" ; ) + $(foreach ASSET_FILE,$(ASSET_FILES), \ + install -D -m 0644 $(ASSET_FILE) "$(DATADIR)/$(APPNAME)/$(ASSET_FILE)" ; ) + install -t /usr/share/man/man1/ doc/neo_layout_viewer.1.gz uninstall: @rm -v "$(EXEC_PREFIX)/bin/$(BINNAME)$(BINEXT)" @@ -184,6 +191,7 @@ uninstall: # clean all build files clean: @rm -v -d -f *~ *.c src/*.c src/*~ "$(BINDIR)"/* "$(BINDIR)" "$(ENV_FILE)" + @rm man/*.gz run: "$(BINDIR)/$(BINNAME)$(BINEXT)" @@ -198,7 +206,8 @@ dist-package: release tar czf ../neo-layout-viewer-${VERSION}.tgz \ --transform 's,^$(BINDIR)/,,' \ --transform 's,^,neo-layout-viewer-${VERSION}/,' \ - "$(BINDIR)/$(BINNAME)" assets AUTHORS COPYING README.md + "$(BINDIR)/$(BINNAME)" assets AUTHORS COPYING README.md \ + man/*.gz ###################################################### diff --git a/debian/manpages b/debian/manpages index bb0e314..4157f49 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1 +1 @@ -debian/neo_layout_viewer.1 +man/neo_layout_viewer.1 diff --git a/debian/neo_layout_viewer.1 b/man/neo_layout_viewer.1 similarity index 98% rename from debian/neo_layout_viewer.1 rename to man/neo_layout_viewer.1 index 1c365d8..5aca93b 100644 --- a/debian/neo_layout_viewer.1 +++ b/man/neo_layout_viewer.1 @@ -89,7 +89,7 @@ just leave it empty. .SH SEE ALSO .TP .I http://neo-layout.org/ -The official homepage of the Neo 2 keyboard layout at +The official homepage of the Neo 2 keyboard layout. .\" .BR bar (1), .\" .BR baz (1). .\" .br