Actually install the cd-convert utility

6 files changed, 137 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 58b7c17..38049cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 NULL =
 
 SUBDIRS = 						\
+	man						\
 	contrib						\
 	libcolord-gtk					\
 	po
diff --git a/client/Makefile.am b/client/Makefile.am
index becddff..f143dcb 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -12,13 +12,13 @@ INCLUDES =						\
 COLORD_GTK_LIBS =					\
 	$(top_builddir)/libcolord-gtk/libcolord-gtk.la
 
-noinst_PROGRAMS =					\
-	colord-convert
+bin_PROGRAMS =						\
+	cd-convert
 
-colord_convert_SOURCES =				\
+cd_convert_SOURCES =					\
 	cd-convert.c
 
-colord_convert_LDADD =					\
+cd_convert_LDADD =					\
 	$(LCMS_LIBS)					\
 	$(COLORD_LIBS)					\
 	$(COLORD_GTK_LIBS)				\
@@ -26,7 +26,7 @@ colord_convert_LDADD =					\
 	$(GLIB_LIBS)					\
 	-lm
 
-colord_convert_CFLAGS =					\
+cd_convert_CFLAGS =					\
 	$(WARNINGFLAGS_C)
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index af75edf..d8f749c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,15 @@ fi
 AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
 
 dnl ---------------------------------------------------------------------------
+dnl - Is docbook2man available?
+dnl ---------------------------------------------------------------------------
+AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no)
+if test "$DOCBOOK2MAN" = "no" ; then
+	AC_MSG_WARN([docbook2man not found, will not be able to build man documentation (if tarball, pre-generated documentation will be installed)])
+fi
+AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
+
+dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
 dnl ---------------------------------------------------------------------------
 AC_CONFIG_FILES([
@@ -168,6 +177,7 @@ contrib/Makefile
 doc/Makefile
 doc/api/Makefile
 doc/api/version.xml
+man/Makefile
 po/Makefile.in
 client/Makefile
 libcolord-gtk/cd-version.h
diff --git a/contrib/colord-gtk.spec.in b/contrib/colord-gtk.spec.in
index 8f1b5cb..bde8b3b 100644
--- a/contrib/colord-gtk.spec.in
+++ b/contrib/colord-gtk.spec.in
@@ -59,6 +59,8 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %files -f %{name}.lang
 %doc README AUTHORS NEWS COPYING
+%{_bindir}/*
+%{_mandir}/man1/*.1.gz
 %{_libdir}/libcolord-gtk.so.*
 %{_libdir}/libcolord-gtk2.so.*
 %{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..f9c22c2
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,30 @@
+man_MANS_DIST = 					\
+	cd-convert.1
+
+EXTRA_DIST =						\
+	cd-convert.sgml					\
+	$(man_MANS_DIST)
+
+if HAVE_DOCBOOK2MAN
+man_MANS =						\
+	$(man_MANS_DIST)
+endif
+
+if HAVE_DOCBOOK2MAN
+cd-convert.1: cd-convert.sgml
+	$(AM_V_GEN)					\
+	docbook2man $? > /dev/null
+endif
+
+MAINTAINERCLEANFILES =					\
+	manpage.links					\
+	manpage.log					\
+	manpage.refs					\
+	$(man_MANS)
+
+clean-local :
+	rm -f *~
+	rm -f *.1
+	rm -f manpage.*
+
+-include $(top_srcdir)/git.mk
diff --git a/man/cd-convert.sgml b/man/cd-convert.sgml
new file mode 100644
index 0000000..5156d17
--- /dev/null
+++ b/man/cd-convert.sgml
@@ -0,0 +1,89 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY date        "<date>7 November,2014</date>">
+  <!ENTITY package     "cd-it8">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      <email>richard@hughsie.com</email>;
+    </address>
+    <author>
+      <firstname>Richard</firstname>
+      <surname>Hughes</surname>
+    </author>
+    <copyright>
+      <year>2014</year>
+      <holder>Richard Hughes</holder>
+    </copyright>
+    &date;
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>cd-convert</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&package;</refname>
+    <refpurpose>Color Manager Testing Tool</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&package;</command>
+      <arg><option>--verbose</option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+      This manual page documents briefly the <command>&package;</command> command.
+    </para>
+    <para>
+      <command>&package;</command> allows an administrator to create
+      IT8 files, such as <filename>.ti3</filename>, <filename>.ccmx</filename>
+      in various ways.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+    <para>
+      This program follows the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.
+    </para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+    <para>This manual page was written by Richard Hughes <email>richard@hughsie.com</email>.
+    </para>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->