* scripts/Makefile.in (w3mhelp-funcname.pl): depends ../funcname.tab

* Makefile.in (IMGOBJS): deleted
	(indep.o): depends on fm.h funcname1.h
	(IMGDISPLAY): depends on w3mimg/w3mimg.a
	(w3mimg/w3mimg.a): renamed from w3mimg
* acinclude.m4 (AC_W3M_IMAGE): modify IMBOBJS
* w3mimg/Makefile.in (AR): added
		(RANLIB): added
		(IMGOBJS): added
		(w3mimg.a): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>

* [w3m-dev 03990] Re: post-m17n merge problem?
* Makefile.in (MAN1): need $(top_srcdir)
		(MAN1_JA): ditto
		(LOBJS): depends on fm.h funcname1.h
		(INFLATE): depends on $(ALIB)
		(libwc/libwc.a): renamed from libwc
		(IMGDISPLAY): depends on $(IMGOBJS) instead of w3mimg
			  depends on $(ALIB)
		(w3mimgdisplay.o): depends on w3mimg/w3mimg.h
* acinclude.m4 (AC_W3M_M17N): WCTARGET is libwc/libwc.a
* configure.in (HELP_DIR): expand ${prefix}
From: qhwt@myrealbox.com

2 files changed, 13 insertions, 13 deletions

diff --git a/configure b/configure
index 3f08105..56a93fa 100755
--- a/configure
+++ b/configure
@@ -2984,7 +2984,7 @@ else
 #define USE_M17N 1
 _ACEOF
 
- WCTARGET="libwc"
+ WCTARGET="libwc/libwc.a"
  WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
  wcinclude='-I$(srcdir)/libwc'
  wclib="-L./libwc -lwc"
@@ -4890,7 +4890,7 @@ fi;
  echo "$as_me:$LINENO: result: $enable_image" >&5
 echo "${ECHO_T}$enable_image" >&6
  if test x"$enable_image" != xno; then
-  IMGOBJS=w3mimg/w3mimg.o
+  IMGOBJS=w3mimg.o
   if test x"$enable_image" = xyes; then
     enable_image=x11
     case "`uname -s`" in
@@ -5035,7 +5035,7 @@ _ACEOF
 #define USE_GDKPIXBUF 1
 _ACEOF
 
-     IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
      IMGTARGETS="x11"
@@ -5048,7 +5048,7 @@ _ACEOF
 #define USE_IMLIB 1
 _ACEOF
 
-     IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
      IMGTARGETS="x11"
@@ -5061,7 +5061,7 @@ _ACEOF
 #define USE_IMLIB2 1
 _ACEOF
 
-     IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+     IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
      IMGTARGETS="x11"
@@ -5080,7 +5080,7 @@ _ACEOF
 #define USE_GDKPIXBUF 1
 _ACEOF
 
-     IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
      IMGTARGETS="${IMGTARGETS} fb"
@@ -5093,7 +5093,7 @@ _ACEOF
 #define USE_IMLIB2 1
 _ACEOF
 
-     IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+     IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
      IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
      IMGTARGETS="${IMGTARGETS} fb"
@@ -9255,14 +9255,14 @@ _ACEOF
  fi
 
 
-HELP_DIR="$datadir/$PACKAGE"
-cat >>confdefs.h <<_ACEOF
+HELP_DIR=$(eval echo "$datadir/$PACKAGE")
+cat >>confdefs.h <<\_ACEOF
 #define HELP_DIR "$HELP_DIR"
 _ACEOF
 
 
 RC_DIR="~/.$PACKAGE"
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
 #define RC_DIR "$RC_DIR"
 _ACEOF
 
diff --git a/configure.in b/configure.in
index 8471ed8..5b4aae8 100644
--- a/configure.in
+++ b/configure.in
@@ -150,11 +150,11 @@ AC_W3M_SIGSETJMP
 AC_W3M_SIGNAL
 
 AC_SUBST(HELP_DIR)
-HELP_DIR="$datadir/$PACKAGE"
-AC_DEFINE_UNQUOTED(HELP_DIR, "$HELP_DIR")
+HELP_DIR=$(eval echo "$datadir/$PACKAGE")
+AC_DEFINE(HELP_DIR, "$HELP_DIR")
 AC_SUBST(RC_DIR)
 RC_DIR="~/.$PACKAGE"
-AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR")
+AC_DEFINE(RC_DIR, "$RC_DIR")
 AC_SUBST(DOCDIRS)
 DOCDIRS="doc:en_English doc-jp:ja_Japanese"
 AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS")