# HG changeset patch # User Yoshiki Yazawa # Date 1216643662 -32400 # Node ID 484ca3d18ebbef39e6b32f7ed0541abef261f162 # Parent 173aa074f0395971e5d8d62324fcd273c7a51565 use PIDGIN_PREFIX to generate PIDGIN_DATA_DIR. diff -r 173aa074f039 -r 484ca3d18ebb Makefile.in --- a/Makefile.in Mon Jul 21 20:22:41 2008 +0900 +++ b/Makefile.in Mon Jul 21 21:34:22 2008 +0900 @@ -3,7 +3,7 @@ HDR = ${SRC:.c=.h} PIDGIN_PLUGIN_DIR = @PIDGIN_PREFIX@/lib/pidgin -PIDGIN_DATA_DIR = @PIDGIN_DATA_DIR@ +PIDGIN_DATA_DIR = @PIDGIN_PREFIX@/share PIDGIN_CFLAGS = @PIDGIN_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@ diff -r 173aa074f039 -r 484ca3d18ebb configure.in --- a/configure.in Mon Jul 21 20:22:41 2008 +0900 +++ b/configure.in Mon Jul 21 21:34:22 2008 +0900 @@ -38,7 +38,6 @@ ])]) PIDGIN_CFLAGS=`pkg-config --cflags pidgin 2> /dev/null` PIDGIN_LIBS=`pkg-config --libs pidgin 2> /dev/null` -PIDGIN_DATA_DIR=`pkg-config --variable=datadir pidgin 2> /dev/null` if test x"$prefix" = x"NONE" ; then PIDGIN_PREFIX=`pkg-config --variable=prefix pidgin 2> /dev/null` else @@ -47,7 +46,6 @@ AC_SUBST(PIDGIN_CFLAGS) AC_SUBST(PIDGIN_LIBS) AC_SUBST(PIDGIN_PREFIX) -AC_SUBST(PIDGIN_DATA_DIR) PKG_CHECK_MODULES(GLIB, [libxml-2.0 >= 2.6.27], , [ AC_MSG_RESULT(no)