From 1b69f21ef4e1f79c93b64fb0966d1a0bc6712294 Mon Sep 17 00:00:00 2001 From: raster Date: Sun, 11 Jun 2006 10:23:49 +0000 Subject: [PATCH] 1. autofoot patches. 2. fix maximize to work again. :) git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/emotion@23375 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.in | 12 ++++-------- emotion-config.in | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index ebc9747..e982d22 100644 --- a/configure.in +++ b/configure.in @@ -47,16 +47,12 @@ if test "x${libdir}" = 'x${exec_prefix}/lib'; then fi fi fi - + dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${datadir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Package Data Directory]) - else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Package Data Directory]) - fi +if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Package Data Directory]) + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory]) fi dnl Set PACKAGE_BIN_DIR in config.h. diff --git a/emotion-config.in b/emotion-config.in index 503445e..4777ba0 100644 --- a/emotion-config.in +++ b/emotion-config.in @@ -39,8 +39,8 @@ while test $# -gt 0; do echo @VERSION@ ;; --cflags) - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ + if test @prefix@/local != /usr/include ; then + includes="-I@prefix@/local" fi echo $includes @EVAS_CFLAGS@ ;; -- 2.7.4