diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | scripts/w3mman/.cvsignore | 2 | ||||
| -rw-r--r-- | scripts/w3mman/Makefile | 19 | ||||
| -rw-r--r-- | scripts/w3mman/w3mman.1.in | 46 | ||||
| -rw-r--r-- | scripts/w3mman/w3mman2html.cgi.in | 1 |
5 files changed, 79 insertions, 5 deletions
@@ -1,3 +1,17 @@ +2002-03-15 Fumitoshi UKAI <ukai@debian.or.jp> + + * [w3m-dev 03130] w3mman.1 + * scripts/w3mman/.cvsignore: add w3mman.1 + * scripts/w3mman/Makefile (MAN_DIR): added + (MAN_TARGETS): added + (all): add $(MAN_TARGETS) + (.in): replace @LIB_DIR@ + (install): install $(MAN_TARGETS) + (uninstall): uninstall $(MAN_TARGETS) + (clean): clean $(MAN_TARGETS) + * scripts/w3mman/w3mman.1.in: added + * scripts/w3mman/w3mman2html.cgi.in: undef $PAGER + 2002-03-15 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> * [w3m-dev 03129] Re: X-Face @@ -3169,4 +3183,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.349 2002/03/14 16:12:02 ukai Exp $ +$Id: ChangeLog,v 1.350 2002/03/14 17:51:41 ukai Exp $ diff --git a/scripts/w3mman/.cvsignore b/scripts/w3mman/.cvsignore index 65b4a28..090cd50 100644 --- a/scripts/w3mman/.cvsignore +++ b/scripts/w3mman/.cvsignore @@ -1,2 +1,4 @@ w3mman w3mman2html.cgi +w3mman.1 + diff --git a/scripts/w3mman/Makefile b/scripts/w3mman/Makefile index 7a629a8..22a5def 100644 --- a/scripts/w3mman/Makefile +++ b/scripts/w3mman/Makefile @@ -2,11 +2,13 @@ prefix = /usr/local BIN_DIR = $(prefix)/bin LIB_DIR = $(prefix)/lib/w3m +MAN_DIR = $(prefix)/man DESTDIR = distdir = ./distfiles TARGETS = w3mman LIB_TARGETS = w3mman2html.cgi +MAN_TARGETS = w3mman.1 MKDIR = mkdir -p INSTALL = install -c @@ -19,16 +21,17 @@ MAN = man .SUFFIXES: .in -all: $(TARGETS) $(LIB_TARGETS) +all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) .in: sed -e 's%@PERL@%$(PERL)%g' \ -e 's%@W3M@%$(W3M)%g' \ -e 's%@MAN@%$(MAN)%g' \ + -e 's%@LIB_DIR@%$(LIB_DIR)%g' \ $< > $@ chmod +x $@ -install: $(TARGETS) $(LIB_TARGETS) +install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) -$(MKDIR) $(DESTDIR)$(BIN_DIR) -$(MKDIR) $(DESTDIR)$(LIB_DIR) for file in $(TARGETS); \ @@ -39,6 +42,10 @@ install: $(TARGETS) $(LIB_TARGETS) do \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ done + for file in $(MAN_TARGETS); \ + do \ + $(INSTALL) -m 644 $$file $(DESTDIR)$(MAN_DIR); \ + done uninstall: -for file in $(TARGETS); \ @@ -49,14 +56,18 @@ uninstall: do \ rm -f $(LIB_DIR)/$$file; \ done + -for file in $(MAN_TARGETS); \ + do \ + rm -f $(MAN_DIR)/$$file; \ + done clean: - -rm -f $(TARGETS) $(LIB_TARGETS) + -rm -f $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) dist: all @-rm -fr $(distdir)/w3mman -$(MKDIR) $(distdir)/w3mman - cp Makefile README w3mman.in w3mman2html.cgi.in hlink.cgi $(distdir)/w3mman + cp Makefile README w3mman.in w3mman2html.cgi.in hlink.cgi w3mman.1.in $(distdir)/w3mman ( cd $(distdir); tar -cf - w3mman | GZIP='' gzip ) \ > $(distdir)/w3mman.tar.gz -rm -fr $(distdir)/w3mman diff --git a/scripts/w3mman/w3mman.1.in b/scripts/w3mman/w3mman.1.in new file mode 100644 index 0000000..2221200 --- /dev/null +++ b/scripts/w3mman/w3mman.1.in @@ -0,0 +1,46 @@ +.TH W3MMAN 1 "Mar 14, 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +w3mman \- an interface to the on-line reference manuals by w3m(1) +.SH SYNOPSIS +.B w3mman +.RI "[-M " path ] " " [ section ] " page" +.br +.B w3mman +.RI "[-M " path "] -k " keyword +.SH DESCRIPTION +.B w3mman +is the system's manual pager by +.BR w3m (1). +.SH OPTIONS +A summary of options is included below. +.TP +.BI \-M " path" +Specify +.I path +as MANPATH. +.TP +.B \-k " keyword" +Specify +.I keyword. +.SH FILES +.TP +.I @LIB_DIR@/w3mman2html.cgi +convert manual page to html. +.SH SEE ALSO +.BR man (1), +.BR w3m (1). +.SH AUTHOR +This manual page was written by Fumitoshi UKAI <ukai@debian.or.jp>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in index 6786928..07e4ca3 100644 --- a/scripts/w3mman/w3mman2html.cgi.in +++ b/scripts/w3mman/w3mman2html.cgi.in @@ -7,6 +7,7 @@ $CGI = "file://$SCRIPT_NAME"; $CGI2 = "file:"; # $CGI2 = "file:///\$LIB/hlink.cgi?"; $SQUEEZE = 1; +undef $ENV{'PAGER'}; if ($QUERY =~ /\=/) { for (split('&', $QUERY)) { |