Make nted look for HTML manuals in proper place
Fedora installs the docs to another place, so it must change
where nted looks for them.
Due to upstream's improper usage of AM_INIT_AUTOMAKE, VERSION
ends being set up wrong, so we call this FIXME_VERSION. Once
upstream fixes their PACKAGE_TARNAME and PACKAGE_VERSION
definitions, we can use them instead.
Due to patching both Makefile.am AND Makefile.in, this patch
does NOT require an automake/autoconf re-run on RPM build.
diff -ru nted-0.22.3/mainwindow.cpp nted-0.22.3-ndim/mainwindow.cpp
--- nted-0.22.3/mainwindow.cpp 2008-04-03 14:15:12.000000000 +0200
+++ nted-0.22.3-ndim/mainwindow.cpp 2008-06-08 15:19:37.000000000 +0200
@@ -7106,14 +7106,14 @@
#ifdef YELP_PATH
langnames = g_get_language_names ();
for (cptr = langnames; *cptr != NULL; cptr++) {
- sprintf(Str, "%s/doc/nted/HTML/%s/index.docbook", DATADIR, *cptr);
+ sprintf(Str, "%s/doc/%s/HTML/%s/index.docbook", DATADIR, FIXME_VERSION, *cptr);
if (!access(Str, R_OK)) {
yelparg = strdup(Str);
break;
}
}
if (yelparg == NULL) {
- sprintf(Str, "%s/doc/nted/HTML/en/index.docbook", DATADIR);
+ sprintf(Str, "%s/doc/%s/HTML/en/index.docbook", DATADIR, FIXME_VERSION);
if (!access(Str, R_OK)) {
yelparg = strdup(Str);
}
diff -ru nted-0.22.3/Makefile.am nted-0.22.3-ndim/Makefile.am
--- nted-0.22.3/Makefile.am 2008-04-02 21:17:01.000000000 +0200
+++ nted-0.22.3-ndim/Makefile.am 2008-06-08 15:19:02.000000000 +0200
@@ -26,7 +26,7 @@
FREETYPE_INCLUDE = @FREETYPE_INCLUDE@
SUBDIRS = commands dialogs icons po datafiles $(DOCSDIR) man
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
+AM_CPPFLAGS = -DFIXME_VERSION=\"$(VERSION)\" -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
AM_LDFLAGS =`pkg-config --libs cairo pango gtk+-2.0` -lasound
if EXTRA_ENV
diff -ru nted-0.22.3/Makefile.in nted-0.22.3-ndim/Makefile.in
--- nted-0.22.3/Makefile.in 2008-04-03 11:17:15.000000000 +0200
+++ nted-0.22.3-ndim/Makefile.in 2008-06-08 15:19:06.000000000 +0200
@@ -217,7 +217,7 @@
top_srcdir = @top_srcdir@
@MAKE_DOCS_TRUE@DOCSDIR = doc
SUBDIRS = commands dialogs icons po datafiles $(DOCSDIR) man
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
+AM_CPPFLAGS = -DFIXME_VERSION=\"$(VERSION)\" -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" $(FREETYPE_INCLUDE) -I./dialogs -I./commands `pkg-config --cflags cairo gtk+-2.0`
AM_LDFLAGS = `pkg-config --libs cairo pango gtk+-2.0` -lasound
@EXTRA_ENV_TRUE@MAKE = @MAKE_WITH_ENV@
nted_SOURCES = mainwindow.cpp resource.cpp page.cpp system.cpp staff.cpp \