summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Abdin <aliabdin@aucegypt.edu>2000-11-21 22:07:51 +0000
committerAli Abdin <rakholh@src.gnome.org>2000-11-21 22:07:51 +0000
commitefbc4fa944849fcb537170f0c8ac755b03554498 (patch)
treedaad3c9f67435a2c0fdce40007550c5f826721d8
parent2edb8f07dd6919f5f0939883f8ccae1e108cb108 (diff)
downloadyelp-post-1_0_4.tar.gz
2000-11-21 Ali Abdin <aliabdin@aucegypt.edu> * components/help/converters/gnome-info2html2/main.c: (main): Check /usr/share/info by default for info files too (Debian uses this). This partially fixes bug #4414 * components/help/converters/gnome-db2html2/sect-preparse.c: (sect_preparse_sect_start_element): Apply a slightly modified patch by John Fleck to handle navigation links with regards to the appendix (Fixes bug #4792)
-rw-r--r--src/info2html/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/info2html/main.c b/src/info2html/main.c
index 6212b9d6..7f5a1d7a 100644
--- a/src/info2html/main.c
+++ b/src/info2html/main.c
@@ -76,11 +76,12 @@ main(int argc, char **argv)
/* First, find the directory that the info file is in. */
dirs[0] = "/usr/info";
+ dirs[1] = "/usr/share/info";
/* We now have at least one directory to look in. This is
* necessary because we may not have an 'INFOPATH' set */
- ndirs = 1;
+ ndirs = 2;
if(infopath)
- for(ndirs = 1, ctmp = strtok((char *)args[0], ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":"))
+ for(ndirs = 2, ctmp = strtok((char *)args[0], ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":"))
dirs[ndirs] = strdup(ctmp);
for(i = 0; i < ndirs; i++)