diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | scripts/w3mman/Makefile | 8 | ||||
| -rw-r--r-- | scripts/w3mman/w3mman2html.cgi.in | 2 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2002-03-16 Fumitoshi UKAI <ukai@debian.or.jp> + + * [w3m-dev 03133] Re: w3mman.1 + * scripts/w3mman/Makefile (MAN1_TARGETS): added + (MAN_TARGETS): use $(MAN_TARGETS) + (INSTALL_MAN): added + (install): use $MAN1_TARGETS, $(INSTALL_MAN) + * scripts/w3mman/w3mman2html.cgi.in: $PAGER='cat' + 2002-03-15 Fumitoshi UKAI <ukai@debian.or.jp> * scripts/.cvsignore: add xface2xbm @@ -3187,4 +3196,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.351 2002/03/14 17:53:29 ukai Exp $ +$Id: ChangeLog,v 1.352 2002/03/15 16:10:26 ukai Exp $ diff --git a/scripts/w3mman/Makefile b/scripts/w3mman/Makefile index 22a5def..8adf5dd 100644 --- a/scripts/w3mman/Makefile +++ b/scripts/w3mman/Makefile @@ -8,11 +8,13 @@ distdir = ./distfiles TARGETS = w3mman LIB_TARGETS = w3mman2html.cgi -MAN_TARGETS = w3mman.1 +MAN1_TARGETS = w3mman.1 +MAN_TARGETS = $(MAN1_TARGETS) MKDIR = mkdir -p INSTALL = install -c INSTALL_SCRIPT = $(INSTALL) -m 755 +INSTALL_MAN = $(INSTALL) -m 644 PERL = /usr/local/bin/perl W3M = w3m @@ -42,9 +44,9 @@ install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS) do \ $(INSTALL_SCRIPT) $$file $(DESTDIR)$(LIB_DIR); \ done - for file in $(MAN_TARGETS); \ + for file in $(MAN1_TARGETS); \ do \ - $(INSTALL) -m 644 $$file $(DESTDIR)$(MAN_DIR); \ + $(INSTALL_MAN) $$file $(DESTDIR)$(MAN_DIR)/man1; \ done uninstall: diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in index 07e4ca3..88eb8d0 100644 --- a/scripts/w3mman/w3mman2html.cgi.in +++ b/scripts/w3mman/w3mman2html.cgi.in @@ -7,7 +7,7 @@ $CGI = "file://$SCRIPT_NAME"; $CGI2 = "file:"; # $CGI2 = "file:///\$LIB/hlink.cgi?"; $SQUEEZE = 1; -undef $ENV{'PAGER'}; +$ENV{'PAGER'} = 'cat'; if ($QUERY =~ /\=/) { for (split('&', $QUERY)) { |