*** configure.ac-kevin	2015-10-13 09:49:11.000000000 +0900
--- configure.ac	2015-10-13 10:35:50.000000000 +0900
***************
*** 347,374 ****
  AC_SUBST(DEFAULTINCLUDEFILESUFFIXES)
  
  dnl
! dnl Quoted langmap & prefix. It is only for gtags.conf.
  dnl
  DEFAULTLANGMAP_QUOTED=`echo $DEFAULTLANGMAP | sed 's/:/\\\\:/g'`
- case "$prefix" in
- NONE)   prefix_QUOTED=`echo $ac_default_prefix | sed 's/:/\\\\:/g'`;;
- *)      prefix_QUOTED=`echo $prefix | sed 's/:/\\\\:/g'`;;
- esac
  dnl We need to provide a valid libdir_QUOTED to consumers.
  dnl The value of $libdir depends on the flags passed to configure.
  dnl The desired behavior is as follows:
  dnl
  dnl 1. If --libdir is set by user, use that.
  dnl 2 If libdir not set by user, ac defaults to '${exec_prefix}/lib' (embedded variable sic)
! dnl   2a.  if exec_prefix is unset (NONE) set to $prefix_QUOTED/lib
! dnl   2b.  if exec_prefix is set, evaluate '{exec_prefix}/lib' into a simple string first.
! libdir_QUOTED=`eval echo $libdir`
! case ${exec_prefix}_"$libdir_QUOTED" in
! "NONE_${exec_prefix}/lib")   libdir_QUOTED=`echo $prefix_QUOTED/lib | sed 's/:/\\\\:/g'`;;
! *)	libdir_QUOTED=`echo $libdir_QUOTED | sed 's/:/\\\\:/g'`;;
! esac
  AC_SUBST(DEFAULTLANGMAP_QUOTED)
- AC_SUBST(prefix_QUOTED)
  AC_SUBST(libdir_QUOTED)
  
  AC_CONFIG_FILES([Makefile
--- 347,377 ----
  AC_SUBST(DEFAULTINCLUDEFILESUFFIXES)
  
  dnl
! dnl Quoted langmap & libdir. It is only for gtags.conf.
  dnl
  DEFAULTLANGMAP_QUOTED=`echo $DEFAULTLANGMAP | sed 's/:/\\\\:/g'`
  dnl We need to provide a valid libdir_QUOTED to consumers.
  dnl The value of $libdir depends on the flags passed to configure.
  dnl The desired behavior is as follows:
  dnl
  dnl 1. If --libdir is set by user, use that.
  dnl 2 If libdir not set by user, ac defaults to '${exec_prefix}/lib' (embedded variable sic)
! dnl   2a.  if exec_prefix is unset (NONE) set to ${prefix}/lib
! dnl   2b.  if exec_prefix is set, evaluate '${exec_prefix}/lib' into a simple string first.
! __real_libdir="$libdir"
! if test "$__real_libdir" = '${exec_prefix}/lib'; then
! 	if test "$exec_prefix" = NONE; then
! 		if test "$prefix" = NONE; then
! 			__real_libdir="$ac_default_prefix/lib"
! 		else
! 			__real_libdir="$prefix/lib"
! 		fi
! 	else
! 		__real_libdir="$exec_prefix/lib"
! 	fi
! fi
! libdir_QUOTED=`echo "$__real_libdir" | sed 's/:/\\\\:/g'`
  AC_SUBST(DEFAULTLANGMAP_QUOTED)
  AC_SUBST(libdir_QUOTED)
  
  AC_CONFIG_FILES([Makefile