Small bug fixes (#364)

* build: move utils/sysdeps to top-level

The routines here are used by iscsiuio, so
move them to the top level.

* libopeniscsiusr: fix kernel-doc bugs

There were errors in four places, effecting the generated
manual pages.

* libopeniscsiusr: clean up kernel-doc usage

Simplify generation of library interface documentation using
the kernel-doc script:

* make the kernel-doc perl script executble (the only visible change)
* remove mention of sed (not used)
* stop compressing man pages -- let distros do that
* improve kernel-doc so that doc-preclean.pl and split-man.pl
  are no longer needed
* add list-man-pages.sh to simplify things (copied from libnvme)

* build: keep current version number in one place

Move the current version number (now 2.1.7) into
the top-level Makefile, and out of usr/version.h and
libopeniscsiusr/version.h, completely eliminating the
need for the latter.

Note that this ties the libopeniscsiusr library idea of
"version" to the usr/ (iscsid, etc) idea of version, even
though they used to be defined separately. But they always
had the same value, so nothing lost.

* build: insteall man pages uncompressed

We were delivering some man pages compressed and other not, and
it turns out distros know how to install man pages using the
compression they prefer, so stop doing it for them.

3 files changed, 10 insertions, 4 deletions

diff --git a/usr/Makefile b/usr/Makefile
index 79840fc..84f33bc 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -46,7 +46,8 @@ PKG_CONFIG ?= /usr/bin/pkg-config
 CFLAGS ?= -O2 -g
 WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
 CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
-	  -I$(TOPDIR)/libopeniscsiusr
+	  -I$(TOPDIR)/libopeniscsiusr \
+	  -DISCSI_VERSION_STR=\"$(ISCSI_VERSION_STR)\"
 CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
 CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd)
 ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
@@ -67,7 +68,7 @@ ISCSIADM_OBJS	= iscsiadm.o session_mgmt.o mntcheck.o
 ISCSISTART_OBJS	= iscsistart.o
 
 # libc compat files
-SYSDEPS_DIR = $(TOPDIR)/utils/sysdeps
+SYSDEPS_DIR = $(TOPDIR)/sysdeps
 SYSDEPS_OBJS = $(SYSDEPS_DIR)/sysdeps.o
 # sources shared between iscsid, iscsiadm and iscsistart
 ISCSI_LIB_OBJS = iscsi_util.o io.o auth.o iscsi_timer.o login.o log.o \
diff --git a/usr/fwparam_ibft/Makefile b/usr/fwparam_ibft/Makefile
index f1479db..7977491 100644
--- a/usr/fwparam_ibft/Makefile
+++ b/usr/fwparam_ibft/Makefile
@@ -37,7 +37,8 @@ CFLAGS ?= -O2 -g
 WARNFLAGS ?= -Wall -Wstrict-prototypes -Wno-format-truncation
 CFLAGS += -fPIC $(WARNFLAGS) -I$(TOPDIR)/include -I$(TOPDIR)/usr -D_GNU_SOURCE \
 	  -I$(TOPDIR)/libopeniscsiusr
-CFLAGS += -DSBINDIR=\"$(SBINDIR)\"
+CFLAGS += -DSBINDIR=\"$(SBINDIR)\" \
+	  -DISCSI_VERSION_STR=\"$(ISCSI_VERSION_STR)\"
 
 all: $(OBJS)
 
diff --git a/usr/version.h b/usr/version.h
index 4b74514..f8be671 100644
--- a/usr/version.h
+++ b/usr/version.h
@@ -5,8 +5,12 @@
  * iSCSI tools version.
  * This may not be the same value as the kernel versions because
  * some other maintainer could merge a patch without going through us
+ *
+ * Version string should be set by the build system, else we have problems
  */
-#define ISCSI_VERSION_STR	"2.1.7"
+#ifndef	ISCSI_VERSION_STR
+#error Must set ISCSI_VERSION_STR
+#endif
 #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
 
 #endif