Install Disobedience manual and make Disobedience use it in preference

to the HTML versio of the man page.

diff --git a/.bzrignore b/.bzrignore
index 0cb8173e69789522b595b5615377a6adb28dd9b1..4551219feb24bd47b94e4f30f343e3e71986e100 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -203,3 +203,4 @@ server/endian
 clients/rtpmon
 libtests/t-resample
 clients/resample
 clients/rtpmon
 libtests/t-resample
 clients/resample

+disobedience/manual/Makefile

diff --git a/configure.ac b/configure.ac
index e48cce252c3c2b1517ecc004fb2783f5cdb7611b..80e8e242bfc35b344011513964afcc5f7a85d683 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,11 @@ if test -z "$pkghttpdir"; then
 fi
 AC_SUBST([pkghttpdir])
 
 fi
 AC_SUBST([pkghttpdir])
 

+if test -z "$dochtmldir"; then
+  dochtmldir='$(docdir)/html'
+fi
+AC_SUBST([dochtmldir])
+

 subdirs="scripts lib"
 if test $want_tests = yes; then
   subdirs="${subdirs} libtests"
 subdirs="scripts lib"
 if test $want_tests = yes; then
   subdirs="${subdirs} libtests"


@@ -823,6 +828,7 @@ AC_CONFIG_FILES([Makefile
                 cgi/Makefile
                 clients/Makefile
                 disobedience/Makefile
                 cgi/Makefile
                 clients/Makefile
                 disobedience/Makefile

+                disobedience/manual/Makefile

                 doc/Makefile
                 templates/Makefile
                 plugins/Makefile
                 doc/Makefile
                 templates/Makefile
                 plugins/Makefile

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 01716338c0b0fbceaace771e43405b0bdb5518fd..9b86bd742a8c49fd88932b16ef0dc5da0a295401 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -17,7 +17,7 @@
 #
 
 bin_PROGRAMS=disobedience
 #
 
 bin_PROGRAMS=disobedience

-pkgdata_DATA=disobedience.html
+SUBDIRS=manual

 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)


@@ -39,12 +39,6 @@ install-exec-hook:
 
 check: check-help
 
 
 check: check-help
 

-disobedience.html: ../doc/disobedience.1 $(top_srcdir)/scripts/htmlman
-       rm -f $@.new
-       $(top_srcdir)/scripts/htmlman $< >$@.new
-       chmod 444 $@.new
-       mv -f $@.new $@
-

 misc.o: images.h
 
 images.h: $(PNGS)
 misc.o: images.h
 
 images.h: $(PNGS)


@@ -67,7 +61,7 @@ check-help: all
        unset DISPLAY;./disobedience --version > /dev/null
        unset DISPLAY;./disobedience --help > /dev/null
 
        unset DISPLAY;./disobedience --version > /dev/null
        unset DISPLAY;./disobedience --help > /dev/null
 

-CLEANFILES=disobedience.html images.h \
+CLEANFILES=images.h \

           *.gcda *.gcov *.gcno *.c.html index.html
 
 export GNUSED
           *.gcda *.gcov *.gcno *.c.html index.html
 
 export GNUSED

diff --git a/disobedience/help.c b/disobedience/help.c
index 8ec405cd206f072fb64f913674dc454cb4f28129..5ebe457c464a80cfdac7dc081d85ef24746f490d 100644 (file)
--- a/disobedience/help.c
+++ b/disobedience/help.c
@@ -29,7 +29,7 @@ void popup_help(void) {
   pid_t pid;
   int w;
 
   pid_t pid;
   int w;
 

-  byte_xasprintf(&path, "%s/disobedience.html", pkgdatadir);
+  byte_xasprintf(&path, "%s/index.html", dochtmldir);

   if(!(pid = xfork())) {
     exitfn = _exit;
     if(!xfork()) {
   if(!(pid = xfork())) {
     exitfn = _exit;
     if(!xfork()) {

diff --git a/disobedience/manual/Makefile.am b/disobedience/manual/Makefile.am
new file mode 100644 (file)
index 0000000..6eddcbc
--- /dev/null
+++ b/disobedience/manual/Makefile.am
@@ -0,0 +1,27 @@
+#
+# This file is part of DisOrder.
+# Copyright (C) 2009 Richard Kettlewell
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+dochtml_DATA=index.html intro.html tabs.html window.html               \
+       disobedience.css                                                \
+       arch-simple.png button-pause.png button-playing.png             \
+       button-random.png button-rtp.png button-scratch.png             \
+       choose-search.png choose.png disobedience-debian-menu.png       \
+       disobedience-terminal.png disorder-email-confirm.png            \
+       disorder-web-login.png login.png menu-control.png               \
+       menu-edit.png menu-help.png menu-server.png queue-menu.png      \
+       queue.png queue2.png recent.png volume-slider.png

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 35667457272c4b2733545ec7052b84522794afa5..0433f9c35b1e80ba7c9f6f94e4cc789715530a98 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -364,7 +364,7 @@ GtkWidget *menubar(GtkWidget *w) {
       0                                 /* extra_data */
     },
     {
       0                                 /* extra_data */
     },
     {

-      (char *)"/Help/Manual page",      /* path */
+      (char *)"/Help/Manual",           /* path */

       0,                                /* accelerator */
       manual_popup,                     /* callback */
       0,                                /* callback_action */
       0,                                /* accelerator */
       manual_popup,                     /* callback */
       0,                                /* callback_action */

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3505eb99ce6f2a2a5a9d9ce3a322ede675e1aba0..11040dbc57f85710edc5ac43135ffbddc9e2ad40 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -122,6 +122,7 @@ definitions.h: Makefile
        echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
        echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
        echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
        echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
        echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
        echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new

+       echo "#define DOCHTMLDIR \"${dochtmldir}\"" >> $@.new

        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new

diff --git a/lib/defs.c b/lib/defs.c
index 633d56adb719b0785bfa01ab100e09c8cfd8fa3a..f0e35b2cd74af9a4ae6dfa4f0f93608a7c833d5f 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -41,6 +41,9 @@ const char pkgstatedir[] = PKGSTATEDIR;
 /** @brief Package fixed data directory */
 const char pkgdatadir[] = PKGDATADIR;
 
 /** @brief Package fixed data directory */
 const char pkgdatadir[] = PKGDATADIR;
 

+/** @brief Package HTML documentation directory */
+const char dochtmldir[] = DOCHTMLDIR;
+

 /** @brief Binary directory */
 const char bindir[] = BINDIR;
 
 /** @brief Binary directory */
 const char bindir[] = BINDIR;
 

diff --git a/lib/defs.h b/lib/defs.h
index 41b65ea584254f7b5a3fbce6ef0b1415a25c7ea0..e13b85718e37aa1eb2305149d52bce7d8f14e4ac 100644 (file)
--- a/lib/defs.h
+++ b/lib/defs.h
@@ -25,6 +25,7 @@ extern const char pkglibdir[];
 extern const char pkgconfdir[];
 extern const char pkgstatedir[];
 extern const char pkgdatadir[];
 extern const char pkgconfdir[];
 extern const char pkgstatedir[];
 extern const char pkgdatadir[];

+extern const char dochtmldir[];

 extern const char bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];
 extern const char bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];