From 9c668722207bc326d723fb35ad069af9c4e379dc Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Fri, 15 Mar 2002 16:10:26 +0000
Subject: [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>

---
 scripts/w3mman/Makefile           | 8 +++++---
 scripts/w3mman/w3mman2html.cgi.in | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts/w3mman')

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)) {
-- 
cgit v1.2.3