diff options
-rw-r--r-- | src/info2html/Makefile.am | 12 | ||||
-rw-r--r-- | src/man2html/Makefile.am | 4 | ||||
-rw-r--r-- | src/man2html/README | 8 | ||||
-rw-r--r-- | src/man2html/yelp-man2html.c | 31 |
4 files changed, 33 insertions, 22 deletions
diff --git a/src/info2html/Makefile.am b/src/info2html/Makefile.am index d6c7d56b..03a764f8 100644 --- a/src/info2html/Makefile.am +++ b/src/info2html/Makefile.am @@ -3,15 +3,11 @@ INCLUDES = \ -I$(includedir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - $(GNOME_INCLUDEDIR) + $(GNOME_CFLAGS) LDADD = \ - $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ - $(INTLLIBS) - -bin_PROGRAMS = gnome-info2html - -gnome_info2html_SOURCES = main.c parse.c utils.c html.c data.h html.h parse.h utils.h version.h + $(GNOMEUI_LIBS) +bin_PROGRAMS = gnome-info2html2 +gnome_info2html2_SOURCES = main.c parse.c utils.c html.c data.h html.h parse.h utils.h version.h diff --git a/src/man2html/Makefile.am b/src/man2html/Makefile.am index 51430b1d..b95b8471 100644 --- a/src/man2html/Makefile.am +++ b/src/man2html/Makefile.am @@ -7,9 +7,9 @@ INCLUDES = \ LDADD = -bin_PROGRAMS = gnome-man2html +bin_PROGRAMS = gnome-man2html2 -gnome_man2html_SOURCES = gnome-man2html.c +gnome_man2html2_SOURCES = gnome-man2html.c #CFLAGS += -Wall diff --git a/src/man2html/README b/src/man2html/README index 8b9da9ab..e3b79ac5 100644 --- a/src/man2html/README +++ b/src/man2html/README @@ -1,10 +1,14 @@ -gnome-man2html +gnome-man2html2 -------------- +Modified version of gnome-man2html2 by Elliot Lee <sopwith@redhat.com> +- slight changes made to the man: URL's output, but otherwise it works +perfectly. + Modified version of VH-Man2html by Michael Fulbright <msf@redhat.com> Please do not contact the individuals below if you have problems with -gnome-man2htm, instead send me an email and I'll try to help. +gnome-man2html2, instead send me an email and I'll try to help. The README for the original program lies below... diff --git a/src/man2html/yelp-man2html.c b/src/man2html/yelp-man2html.c index f3aa97dc..5fc55ea2 100644 --- a/src/man2html/yelp-man2html.c +++ b/src/man2html/yelp-man2html.c @@ -4,8 +4,19 @@ ** ** Permission is granted to distribute, modify and use this program as long ** as this comment is not removed or changed. +* In addition, +* +* Copyright (C) 1999 Red Hat Software +* Changes licensed under the GNU Public License. */ +/* + * gnome-man2html2 + * This version modified for GNOME - December 1999 + * Elliot Lee <sopwith@redhat.com> + * May this code live forever :) + */ + /* * gnome-man2html * This version modified for GNOME - February 1998 @@ -551,16 +562,16 @@ add_links(char *c) "file:/usr/man/man%c/%s.%c\">%s</A>", sec, h, sec, h); #else - if (subsec) - printf("<A HREF=\"man:" - "%s(%c%c)\">%s</A>", - h, sec, - tolower(subsec), h); - else - printf("<A HREF=\"man:" - "%s(%c)\">%s</A>", - h, sec, h); - + /* The code used to take + 'subsec' into account, but + (a) 'subsec' can be more than + one character (b) We have + no use for that information */ + + printf("<A HREF=\"man:" + "%s.%c\">%s</A>", + h, sec, + h); #endif *e=t; c=e; |