w3m

commit d3d9170975aec2963dd50556deb9d385872c36e5
parent 808059f98bb508efe2078b7d69a36e527ebfb271
Author: ukai <ukai>
Date:   Wed,  6 Nov 2002 14:58:02 +0000

[w3m-dev 03380] fix configure
* configure: s/INSTALL_W3MIMGDISPLAY/install_w3mimgdisplay/
		already define
* config.h.dist (INSTALL_W3MIMGDISPLAY): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
config.h.dist
 | 
1
+
M
configure
 | 
7
+++----

3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-06  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03380] fix configure
+	* configure: s/INSTALL_W3MIMGDISPLAY/install_w3mimgdisplay/
+			already define
+	* config.h.dist (INSTALL_W3MIMGDISPLAY): added
+
 2002-11-06  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 03379] setuid w3mimgdisplay and check console tty
diff --git a/config.h.dist b/config.h.dist
@@ -98,6 +98,7 @@ MKDIR=mkdir -p
 PERL=/usr/local/bin/perl
 VERSION=0.2.2
 MODEL=Linux.i686-monster-ja
+INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
 #else
 
 
diff --git a/configure b/configure
@@ -798,6 +798,7 @@ ask_param "Inline image support" use_image n
 if [ "$use_image" = y ]; then
   def_use_image="#define USE_IMAGE"
   imgtarget='$(IMGDISPLAY)'
+  install_w3mimgdisplay='$(INSTALL_PROGRAM)'
   ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y
   d_w3mimg_fb=n
   case $sysname in
@@ -809,9 +810,7 @@ if [ "$use_image" = y ]; then
     if [ "$use_w3mimg_fb" = y ]; then
 	ask_param "setuid w3mimgdisplay to open /dev/fb0?" w3mimgdisplay_setuid  y
 	if [ "$w3mimgdisplay_setuid" = y ]; then
-	    INSTALL_W3MIMGDISPLAY='$(INSTALL) -o root -m 4755 -s'
-	else
-	    INSTALL_W3MIMGDISPLAY='$(INSTALL_PROGRAM)'
+	    install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
 	fi
     fi
     ;;
@@ -2327,7 +2326,7 @@ MKDIR=$MKDIR
 PERL=$perl
 VERSION=$w3mversion
 MODEL=$sysname.$platform-$modelname-$lang
-INSTALL_W3MIMGDISPLAY=$INSTALL_W3MIMGDISPLAY
+INSTALL_W3MIMGDISPLAY=$install_w3mimgdisplay
 #else
 $special_sys