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

>> In article <[email protected]>, Fumitoshi UKAI <[email protected]> writes:

>  -m17n 
> 



1. linux  w3mimg/fb 
  

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'

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: aclocal.m4
===================================================================
RCS file: /cvsroot/w3m/w3m/aclocal.m4,v
retrieving revision 1.28
diff -u -r1.28 aclocal.m4
--- aclocal.m4	22 Sep 2003 23:01:27 -0000	1.28
+++ aclocal.m4	24 Sep 2003 02:13:26 -0000
@@ -564,6 +564,7 @@
  AC_SUBST(USE_GDKPIXBUF)
  AC_SUBST(USE_IMLIB)
  AC_SUBST(USE_IMLIB2)
+ AC_SUBST(IMGDIR)
  AC_SUBST(IMGOBJS)
  AC_SUBST(IMGX11CFLAGS)
  AC_SUBST(IMGX11LDFLAGS)
@@ -648,6 +649,7 @@
    else
      AC_MSG_WARN([unable to build w3mimgdisplay with X11 support])
    fi
+   IMGDIR="x11"
   fi
   if test x"$fb" = xyes; then
    if test x"$have_gdkpixbuf" = xyes; then
@@ -665,7 +667,13 @@
    else
      AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
    fi
+   if test x"$x11" = xyes; then
+     IMGDIR="x11 fb"
+   else
+     IMGDIR="fb"
+   fi
   fi
+  AC_DEFINE(IMGDIR, "$IMGDIR")
   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.2
diff -u -r1.2 Makefile.in
--- scripts/Makefile.in	22 Sep 2003 23:16:45 -0000	1.2
+++ scripts/Makefile.in	24 Sep 2003 02:13:43 -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
@@ -102,12 +103,12 @@
 	-rm -f $(HELP_TARGETS) w3mhelp-*.pl
 	-for dir in multipart w3mman; \
 	do \
-	  cd $$dir && $(MAKE) clean; \
+	  (cd $$dir && $(MAKE) clean); \
 	done
 
 distclean:
 	-rm -f $(LIB_TARGETS) $(AUXBIN_TARGETS) 
 	-for dir in multipart w3mman; \
 	do \
-	  cd $$dir && $(MAKE) distclean; \
-	done
\ No newline at end of file
+	  (cd $$dir && $(MAKE) distclean); \
+	done
Index: w3mimg/Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/w3mimg/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- w3mimg/Makefile.in	22 Sep 2003 23:12:56 -0000	1.2
+++ w3mimg/Makefile.in	24 Sep 2003 02:13:43 -0000
@@ -10,18 +10,18 @@
 
 IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@
 
-.PHONY: fb x11
-all: w3mimg.o fb x11
+.PHONY: @IMGDIR@
+all: w3mimg.o @IMGDIR@
 
 w3mimg.o: w3mimg.c
 	$(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -I$(top_srcdir) -I$(srcdir) -c $<
 
-fb x11:
+@IMGDIR@:
 	cd $@ && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
 
 clean:
 	@-$(RM) -f *.o
-	@for dir in fb x11; do \
+	@for dir in @IMGDIR@; do \
 		(cd $$dir && $(MAKE) clean RM=$(RM)); \
 	 done
 

-- 
  (E-mail: [email protected])