changeset 132:484ca3d18ebb

use PIDGIN_PREFIX to generate PIDGIN_DATA_DIR.
author Yoshiki Yazawa <yaz@honeyplnaet.jp>
date Mon, 21 Jul 2008 21:34:22 +0900
parents 173aa074f039
children 45a1d5428d89
files Makefile.in configure.in
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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@
--- 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)