diff -upr mate-desktop-1.10.0-orig/configure.ac mate-desktop-1.10.0/configure.ac
--- mate-desktop-1.10.0-orig/configure.ac 2015-04-05 19:37:18.000000000 +0200
+++ mate-desktop-1.10.0/configure.ac 2015-07-03 12:43:29.258760021 +0200
@@ -81,6 +81,12 @@ AC_ARG_ENABLE([mate-about],
[enable_mate_about=yes])
AM_CONDITIONAL(MATE_ABOUT_ENABLED, test "x$enable_mate_about" = "xyes")
+# Should we build user-guide? Will be useful until mate-user-guide
+# is complete and translated
+AC_ARG_ENABLE([user-guide],
+ [AS_HELP_STRING([--disable-user-guide],[do not build user guide])],,
+ [enable_user_guide=yes])
+AM_CONDITIONAL(USER_GUIDE_ENABLED, test "x$enable_user_guide" = "xyes")
# Install tool to migrate 1.4 MateConf settings
AC_ARG_ENABLE([mate-conf-import],
@@ -302,6 +308,8 @@ man/Makefile
tools/mate-color-select.desktop.in
tools/mate-conf-import.desktop.in
tools/Makefile
+user-guide/Makefile
+user-guide/mate-user-guide.desktop.in
])
AC_OUTPUT
@@ -330,6 +338,7 @@ mate-desktop $VERSION
Gtk+ version: ${GTK_API_VERSION}
Build mate-about: ${enable_mate_about}
+ Build user guide: ${enable_user_guide}
Install mate-conf-import: ${enable_mate_conf_import}
Install mpaste: ${enable_mpaste}
Use external pnp.ids: ${EXTERNAL_PNP_IDS}
diff -upr mate-desktop-1.10.0-orig/Makefile.am mate-desktop-1.10.0/Makefile.am
--- mate-desktop-1.10.0-orig/Makefile.am 2015-04-05 19:22:23.000000000 +0200
+++ mate-desktop-1.10.0/Makefile.am 2015-07-03 12:25:07.630302340 +0200
@@ -3,6 +3,9 @@ SUBDIRS = libmate-desktop man docs po sc
if MATE_ABOUT_ENABLED
SUBDIRS += mate-about
endif
+if USER_GUIDE_ENABLED
+SUBDIRS += user-guide
+endif
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff -upr mate-desktop-1.10.0-orig/po/POTFILES.in mate-desktop-1.10.0/po/POTFILES.in
--- mate-desktop-1.10.0-orig/po/POTFILES.in 2015-04-05 19:22:23.000000000 +0200
+++ mate-desktop-1.10.0/po/POTFILES.in 2015-07-03 12:14:38.309819170 +0200
@@ -35,3 +35,4 @@ schemas/org.mate.typing-break.gschema.xm
tools/mate-color-select.c
tools/mate-color-select.desktop.in.in
tools/mate-conf-import.desktop.in.in
+user-guide/mate-user-guide.desktop.in.in
diff -upr mate-desktop-1.10.0-orig/po/POTFILES.skip mate-desktop-1.10.0/po/POTFILES.skip
--- mate-desktop-1.10.0-orig/po/POTFILES.skip 2015-04-05 19:22:23.000000000 +0200
+++ mate-desktop-1.10.0/po/POTFILES.skip 2015-07-03 12:42:58.733441873 +0200
@@ -5,4 +5,3 @@ mate-about/mate-about.desktop.in
mate-version.xml.in
tools/mate-color-select.desktop.in
tools/mate-conf-import.desktop.in
-user-guide/mate-user-guide.desktop.in
diff -upr mate-desktop-1.10.0-orig/user-guide/Makefile.am mate-desktop-1.10.0/user-guide/Makefile.am
--- mate-desktop-1.10.0-orig/user-guide/Makefile.am 2015-07-01 22:30:40.000000000 +0200
+++ mate-desktop-1.10.0/user-guide/Makefile.am 2015-07-03 12:17:29.001577613 +0200
@@ -85,4 +85,11 @@ HELP_MEDIA = \
HELP_LINGUAS = ar bg cs de el es eu fi fr gl hu id it ja ko oc pa pt pt_BR ru sv th uk zh_CN
+@INTLTOOL_DESKTOP_RULE@
+desktopdir = $(datadir)/applications
+desktop_in_files = mate-user-guide.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+CLEANFILES = $(desktop_DATA)
+
-include $(top_srcdir)/git.mk