Install manpage

(and fix two white space issues)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

diff --git a/Makefile b/Makefile
index 862a5cbd0261b93b237ea869b1fe32fe88e4b556..be44007ff83df88d5a075aeee070e73e896c7785 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,17 @@ INSTALL=install
 # prefix = $(HOME)
 prefix = /usr
 DESTDIR = $(prefix)/bin
-DESKTOPDIR = $(prefix)/share/applications
-ICONPATH = $(prefix)/share/icons/hicolor
+DATADIR = $(prefix)/share
+DESKTOPDIR = $(DATADIR)/applications
+ICONPATH = $(DATADIR)/icons/hicolor
 ICONDIR = $(ICONPATH)/scalable/apps
+MANDIR = $(DATADIR)/man/man1
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
 
 NAME = subsurface
 ICONFILE = $(NAME).svg
 DESKTOPFILE = $(NAME).desktop
+MANFILES = $(NAME).1
 
 # find libdivecomputer; we don't trust pkg-config here given how young
 # libdivecomputer still is - so we check /usr/local and /usr and then we
@@ -63,6 +66,7 @@ install: $(NAME)
        $(INSTALL) -d -m 755 $(ICONDIR)
        $(INSTALL) $(ICONFILE) $(ICONDIR)
        $(gtk_update_icon_cache)
+       $(INSTALL) -m 644 $(MANFILES) $(MANDIR)
 
 parse-xml.o: parse-xml.c dive.h
        $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c

diff --git a/subsurface.1 b/subsurface.1
index 401796f4a7442af6eee49bf64460431b50492840..1e636f27590628f94583c9945f89fc089f093e28 100644 (file)
--- a/subsurface.1
+++ b/subsurface.1
@@ -8,7 +8,7 @@ subsurface
 .B subsurface
 allows you to manage your dive logs that you can download from your dive computer or import from existing XML files.
 .PP
-The 
+The
 .B Dive Profile
 and
 .B Dive List
@@ -24,6 +24,6 @@ the last of those dives is numbered.
 show more output during processing
 .PP
 .B --import
-all further files should be processed as import, not open 
+all further files should be processed as import, not open
 .SH BUGS
 lots. Tell us if you find some.