w3m

commit 5b5e686819a947fac75868f418debfaf3a8b5d4a
parent 68fd9a40a4f11b07a706db38fdedf65e197ce1be
Author: ukai <ukai>
Date:   Fri, 15 Mar 2002 16:10:26 +0000

[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'
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
scripts/w3mman/Makefile
 | 
8
+++++---
M
scripts/w3mman/w3mman2html.cgi.in
 | 
2
+-

3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git 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
@@ -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)) {