[w3m-dev 03973] Re: w3m 0.4.2 released & -m17n patch merged in CVS

At Wed, 24 Sep 2003 11:18:36 +0900 (JST),
SAKAI Kiyotaka wrote:
> >  -m17n 
> > 
> 
> 


 
> 1. linux  w3mimg/fb 
>   

IMGDIR IMGTARGETS all  @IMGTARGETS@

 
> 2. script 
> 
>     generating w3mhelp-funcdesc*.pl...
>     /bin/bash: -c: line 1: syntax error near unexpected token `;'
>     /bin/bash: -c: line 1: `for dirlang in ; do  dir=`expr "$dirlang" : "\(.*\):.*"`;  lang=`expr "$dirlang" : ".*:\(.*\)_.*"`;  echo '%funcdesc = (' > w3mhelp-funcdesc.$lang.pl;  sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[     ][     ]*\(.*\)/'\1', '\2',/p" < ../$dir/README.func >> w3mhelp-funcdesc.$lang.pl;  echo ');' >> w3mhelp-funcdesc.$lang.pl;  cat ./w3mhelp-funcdesc.$lang.pl.in >> w3mhelp-funcdesc.$lang.pl;  done'

DOCDIRS
 
> 3. script  make clean 
>   
> 
>     rm -f w3mhelp-funcname.pl w3mhelp-funcdesc-stamp w3mhelp-*.pl
>     for dir in multipart w3mman; \
>     do \
>       cd $dir && make clean; \
>     done
>     make[1]: Entering directory `/home/so1/ksakai/src/w3m/scripts/multipart'
>     make[1]: Nothing to be done for `clean'.
>     make[1]: Leaving directory `/home/so1/ksakai/src/w3m/scripts/multipart'
>     /bin/bash: cd: w3mman: No such file or directory
>     make: [clean] Error 1 (ignored)



-- 


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/w3m/w3m/acinclude.m4,v
retrieving revision 1.28
diff -u -u -r1.28 acinclude.m4
--- acinclude.m4	22 Sep 2003 23:01:27 -0000	1.28
+++ acinclude.m4	24 Sep 2003 14:02:37 -0000
@@ -552,6 +552,7 @@
  AC_SUBST(USE_GDKPIXBUF)
  AC_SUBST(USE_IMLIB)
  AC_SUBST(USE_IMLIB2)
+ AC_SUBST(IMGTARGETS)
  AC_SUBST(IMGOBJS)
  AC_SUBST(IMGX11CFLAGS)
  AC_SUBST(IMGX11LDFLAGS)
@@ -599,6 +600,7 @@
   if test x"$GDKPIXBUF_CONFIG" = x; then
     GDKPIXBUF_CONFIG=gdk-pixbuf-config
   fi
+  IMGTARGETS=""
   AC_W3M_CHECK_VER([GdkPixbuf],
 	[`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
 	0, 16, 0,
@@ -621,18 +623,21 @@
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
+     IMGTARGETS="x11"    
    elif test x"$have_imlib" = xyes; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
+     IMGTARGETS="x11"    
    elif test x"$have_imlib2" = xyes; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
+     IMGTARGETS="x11"    
    else
      AC_MSG_WARN([unable to build w3mimgdisplay with X11 support])
    fi
@@ -644,16 +649,19 @@
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
+     IMGTARGETS="${IMGTARGETS} fb"
    elif test x"$have_imlib2" = xyes; then
      AC_DEFINE(USE_W3MIMG_FB)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
      IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
+     IMGTARGETS="${IMGTARGETS} fb"
    else
      AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
    fi
   fi
+  AC_DEFINE(IMGTARGETS, "$IMGTARGETS")
   AC_DEFINE(IMGOBJS, "$IMGOBJS")
   AC_DEFINE(IMGX11CFLAGS, "$IMGX11CFLAGS")
   AC_DEFINE(IMGX11LDFLAGS, "$IMGX11LDFLAGS")
Index: scripts/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/scripts/Makefile.in,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile.in
--- scripts/Makefile.in	23 Sep 2003 17:42:07 -0000	1.3
+++ scripts/Makefile.in	24 Sep 2003 14:02:38 -0000
@@ -28,6 +28,7 @@
 RC_DIR = ~/.$(package)
 ETC_DIR = $(sysconfdir)
 CONF_DIR = $(sysconfdir)/$(package)
+DOCDIRS = @DOCDIRS@
 
 AUXBIN_TARGETS	= xface2xpm
 LIB_TARGETS	= dirlist.cgi w3mhelp.cgi w3mmail.cgi
@@ -110,4 +111,4 @@
 	-for dir in multipart w3mman; \
 	do \
 	  (cd $$dir && $(MAKE) distclean); \
-	done
\ No newline at end of file
+	done
Index: w3mimg/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/w3mimg/Makefile.in,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.in
--- w3mimg/Makefile.in	22 Sep 2003 23:12:56 -0000	1.2
+++ w3mimg/Makefile.in	24 Sep 2003 14:02:38 -0000
@@ -11,7 +11,7 @@
 IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@
 
 .PHONY: fb x11
-all: w3mimg.o fb x11
+all: w3mimg.o @IMGTARGETS@
 
 w3mimg.o: w3mimg.c
 	$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -I$(top_srcdir) -I$(srcdir) -c $<