[gbrainy] 768051 - Port to new documentation infrastructure



commit cd523462aada0d61b18f6e0f28d748840e3276a3
Author: Jeremy Bicha <>
Date:   Sun Jul 17 09:50:56 2016 +0200

    768051 - Port to new documentation infrastructure

 Makefile.am                    |    8 ++------
 autogen.sh                     |    4 ++--
 configure.ac                   |    2 +-
 help/Makefile.am               |   13 +++++--------
 platforms/win32/src/Defines.cs |    4 ++--
 5 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4e386ed..3c7f3ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,13 +16,9 @@ EXTRA_DIST =                 \
        MAINTAINERS             \
        intltool-extract.in     \
        intltool-merge.in       \
-       intltool-update.in      \
-       gnome-doc-utils.make
+       intltool-update.in
 
 DISTCLEANFILES = \
         intltool-extract        \
         intltool-merge          \
-        intltool-update         \
-       gnome-doc-utils.make
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+        intltool-update
diff --git a/autogen.sh b/autogen.sh
index 4b588b3..48440c7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -75,8 +75,8 @@ grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null && {
   }
 }
 
-(which gnome-doc-prepare && gnome-doc-prepare )|| {
-       echo "**Error**: You must have gnome-common (sometimes packaged as gnome-doc-utils) installed to 
compile $PROJECT."
+(which yelp-build)|| {
+       echo "**Error**: You must have yelp-tools installed to compile $PROJECT."
        DIE=1
 }
 
diff --git a/configure.ac b/configure.ac
index 2c3380d..070bca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ fi
 
 dnl -- Initialize docs
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 dnl -- Check for mono pc file
 
diff --git a/help/Makefile.am b/help/Makefile.am
index c4a81c2..ccee301 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
+@YELP_HELP_RULES@
 
-DOC_ID = gbrainy
-DOC_INCLUDES = legal.xml
+HELP_ID = gbrainy
 
-DOC_FIGURES = \
+HELP_MEDIA = \
        figures/all-games.png           \
        figures/logic-games.png         \
        figures/memory-games.png        \
@@ -12,7 +11,7 @@ DOC_FIGURES = \
        figures/verbal-games.png        
 
 
-DOC_PAGES = \
+HELP_FILES = \
        customgame.page \
        gametypes.page  \
        license.page    \
@@ -28,6 +27,4 @@ DOC_PAGES = \
        times.page      \
        export.page
 
-DOC_LINGUAS = af ca cs da de el es fr gl hi hu it nl pt_BR ro ru sl sr sr@latin sv
-
-dist-hook: doc-dist-hook
+HELP_LINGUAS = af ca cs da de el es fr gl hi hu it nl pt_BR ro ru sl sr sr@latin sv
diff --git a/platforms/win32/src/Defines.cs b/platforms/win32/src/Defines.cs
index 41a229d..02d3d55 100644
--- a/platforms/win32/src/Defines.cs
+++ b/platforms/win32/src/Defines.cs
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA 02110-1301, USA.
  */
 
 using System;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]