--- help/Makefile.am.orig 2015-07-03 15:03:50.000000000 -0500
+++ help/Makefile.am 2015-07-05 15:35:16.269700080 -0500
@@ -1,8 +1,11 @@
SUBDIRS=figures
-EXTRA_DIST = $(noinst_DATA) $(man_MANS)
-#helpdir = ${datadir}/gnome/help/lordsawar/C/
+EXTRA_DIST = $(help_DATA) $(man_MANS)
+helpdir = ${datadir}/gnome/help/lordsawar/C/
-noinst_DATA = legal.xml lordsawar.xml manual.map
+help_DATA = legal.xml lordsawar.xml manual.map lordsawar.html
+
+lordsawar.html:
+ docbook2html --nochunks -e no-valid lordsawar.xml
man_MANS = lordsawar.6 lordsawar-editor.6 \
lordsawar-game-list-server.6 lordsawar-game-list-client.6 \
--- help/Makefile.in.orig 2015-07-03 15:04:09.000000000 -0500
+++ help/Makefile.in 2015-07-05 15:35:28.474251215 -0500
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,7 +90,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = help
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -88,6 +97,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -147,10 +157,10 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
man6dir = $(mandir)/man6
-am__installdirs = "$(DESTDIR)$(man6dir)"
+am__installdirs = "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(helpdir)"
NROFF = nroff
MANS = $(man_MANS)
-DATA = $(noinst_DATA)
+DATA = $(help_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -179,6 +189,7 @@
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -381,9 +392,9 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = figures
-EXTRA_DIST = $(noinst_DATA) $(man_MANS)
-#helpdir = ${datadir}/gnome/help/lordsawar/C/
-noinst_DATA = legal.xml lordsawar.xml manual.map
+EXTRA_DIST = $(help_DATA) $(man_MANS)
+helpdir = ${datadir}/gnome/help/lordsawar/C/
+help_DATA = legal.xml lordsawar.xml manual.map lordsawar.html
man_MANS = lordsawar.6 lordsawar-editor.6 \
lordsawar-game-list-server.6 lordsawar-game-list-client.6 \
lordsawar-game-host-server.6 lordsawar-game-host-client.6 \
@@ -404,7 +415,6 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu help/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -471,6 +481,27 @@
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man6dir)'; $(am__uninstall_files_from_dir)
+install-helpDATA: $(help_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(helpdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(helpdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(helpdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(helpdir)" || exit $$?; \
+ done
+
+uninstall-helpDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(helpdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -631,7 +662,7 @@
all-am: Makefile $(MANS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(man6dir)"; do \
+ for dir in "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(helpdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -684,7 +715,7 @@
info-am:
-install-data-am: install-man
+install-data-am: install-helpDATA install-man
install-dvi: install-dvi-recursive
@@ -728,7 +759,7 @@
ps-am:
-uninstall-am: uninstall-man
+uninstall-am: uninstall-helpDATA uninstall-man
uninstall-man: uninstall-man6
@@ -739,15 +770,20 @@
ctags-am distclean distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-man6 install-pdf install-pdf-am install-ps \
+ install-dvi-am install-exec install-exec-am install-helpDATA \
+ install-html install-html-am install-info install-info-am \
+ install-man install-man6 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-man uninstall-man6
+ uninstall-am uninstall-helpDATA uninstall-man uninstall-man6
+
+.PRECIOUS: Makefile
+
+lordsawar.html:
+ docbook2html --nochunks -e no-valid lordsawar.xml
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- help/figures/Makefile.am.orig 2015-07-03 15:03:50.000000000 -0500
+++ help/figures/Makefile.am 2015-07-05 15:34:33.592275999 -0500
@@ -1,8 +1,8 @@
-EXTRA_DIST = $(noinst_DATA)
-#helpdir = ${datadir}/gnome/help/lordsawar/C/figures
+EXTRA_DIST = $(help_DATA)
+helpdir = ${datadir}/gnome/help/lordsawar/C/figures
-noinst_DATA = city_window.png conquer_city.png buy_production.png \
+help_DATA = city_window.png conquer_city.png buy_production.png \
army_unit_info.png army_bonus.png fight_order.png \
fight_one_vs_one.png fighting_one_vs_one.png \
fought_one_vs_one.png fight_city_one_vs_two.png \
--- help/figures/Makefile.in.orig 2015-07-03 15:04:09.000000000 -0500
+++ help/figures/Makefile.in 2015-07-05 15:34:50.316401549 -0500
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,7 +90,6 @@
host_triplet = @host@
target_triplet = @target@
subdir = help/figures
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -88,6 +97,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -111,8 +121,37 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-DATA = $(noinst_DATA)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(helpdir)"
+DATA = $(help_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -289,9 +328,9 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = $(noinst_DATA)
-#helpdir = ${datadir}/gnome/help/lordsawar/C/figures
-noinst_DATA = city_window.png conquer_city.png buy_production.png \
+EXTRA_DIST = $(help_DATA)
+helpdir = ${datadir}/gnome/help/lordsawar/C/figures
+help_DATA = city_window.png conquer_city.png buy_production.png \
army_unit_info.png army_bonus.png fight_order.png \
fight_one_vs_one.png fighting_one_vs_one.png \
fought_one_vs_one.png fight_city_one_vs_two.png \
@@ -364,7 +403,6 @@
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/figures/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu help/figures/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -388,6 +426,27 @@
clean-libtool:
-rm -rf .libs _libs
+install-helpDATA: $(help_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(helpdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(helpdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(helpdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(helpdir)" || exit $$?; \
+ done
+
+uninstall-helpDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(helpdir)'; $(am__uninstall_files_from_dir)
tags TAGS:
ctags CTAGS:
@@ -429,6 +488,9 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
+ for dir in "$(DESTDIR)$(helpdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -479,7 +541,7 @@
info-am:
-install-data-am:
+install-data-am: install-helpDATA
install-dvi: install-dvi-am
@@ -523,7 +585,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-helpDATA
.MAKE: install-am install-strip
@@ -531,13 +593,15 @@
cscopelist-am ctags-am distclean distclean-generic \
distclean-libtool distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags-am uninstall uninstall-am
+ install-dvi-am install-exec install-exec-am install-helpDATA \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags-am uninstall uninstall-am uninstall-helpDATA
+
+.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- src/gui/game-window.cpp.orig 2015-07-05 16:18:19.918068502 -0500
+++ src/gui/game-window.cpp 2015-07-05 16:19:29.707938435 -0500
@@ -2760,7 +2760,7 @@
{
GError *errs = NULL;
gtk_show_uri(window->get_screen()->gobj(),
- "http://www.nongnu.org/lordsawar/manual/" PACKAGE_VERSION "/lordsawar.html", 0, &errs);
+ "file://" HELPDIR "/lordsawar.html", 0, &errs);
return;
}
--- src/gui/Makefile.am.orig 2015-07-05 16:30:19.681546739 -0500
+++ src/gui/Makefile.am 2015-07-05 16:31:04.748274488 -0500
@@ -88,4 +88,4 @@
$(GSTREAMER_CFLAGS) \
-I$(top_srcdir)/src
-AM_CXXFLAGS = -Wall -Wshadow -Wextra -pedantic
+AM_CXXFLAGS = -Wall -Wshadow -Wextra -pedantic -DHELPDIR=\"$(datadir)/gnome/help/lordsawar/C\"
--- src/gui/Makefile.in.orig 2015-07-05 16:30:29.698819882 -0500
+++ src/gui/Makefile.in 2015-07-05 16:31:48.738865466 -0500
@@ -466,7 +466,7 @@
$(GSTREAMER_CFLAGS) \
-I$(top_srcdir)/src
-AM_CXXFLAGS = -Wall -Wshadow -Wextra -pedantic
+AM_CXXFLAGS = -Wall -Wshadow -Wextra -pedantic -DHELPDIR=\"$(datadir)/gnome/help/lordsawar/C\"
all: all-am
.SUFFIXES: