[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [E-devel] problems with unstable autoconf and use of datadir variable



Vincent Torri wrote:
Hey,

it seems that some distro (debian) update autoconf with an unstable
version of autoconf. This version does not seems to work with
configure.in/ac that uses the datadir variable.

I know that the topic of #edevelop mentions it. But a mail on the autoconf
ML says that we must be careful on the use of that variable [1].

So i've looked a bit at the autoconf manual, and I find that (page 24) :

"you should not use [datadir] except in Makefiles. For instance, instead
of evaluate datadir in 'configure' and hard-coding it in Makefiles, using
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}"), you should add
'-DDATADIR="$(datadir)" to your CPPFLAGS.
Similarly you should not rely on AC_OUTPUT_FILES to replace datadir in
your shell scripts."

There's an example on how to manage the .in script files like
evas-config.in.

Maybe we should follow the autoconf manual recommandations, no ?

Vincent

[1] http://lists.gnu.org/archive/html/bug-autoconf/2006-05/msg00081.html


_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Ok! hey peoples !

I have the news autotools from debian unstable, that's mean that my e17 repository won't compile anymore. So i have fixed configures and "apps"-config files too.

The patch attached is a temporary and you dont need to put in under the cvs. That means i made it for peoples like me who cant compile e17 at the moment..

Fixing :

+ remove datadir from all configure.in/ac
+ change *-config.in variables problems

If you apply the patch please dont use configure --datarootdir variable! It doesnt work anymore, that will automaticaly put data under your prefix/share.


I know that's not professional, and it's NOT a CORRET fix. But it could help some of peoples.

Regards,
cvs diff: Diffing .
cvs diff: Diffing CVSROOT
cvs diff: Diffing apps
cvs diff: Diffing apps/e
Index: apps/e/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/e/configure.in,v
retrieving revision 1.118
diff -u -r1.118 configure.in
--- apps/e/configure.in	10 Jun 2006 02:35:58 -0000	1.118
+++ apps/e/configure.in	10 Jun 2006 14:51:39 -0000
@@ -128,17 +128,12 @@
 fi
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
+if test "x${prefix}" = "xNONE"; then
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", "Package installed data destination")
     AC_DEFINE_UNQUOTED(LOCALE_DIR, "${ac_default_prefix}/share/locale", "Locale directory")
-  else
+else
     AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
     AC_DEFINE_UNQUOTED(LOCALE_DIR, "${prefix}/share/locale", "Locale directory")
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", "Package installed data destination")
-  AC_DEFINE_UNQUOTED(LOCALE_DIR, "${datadir}/locale", "Locale directory")
 fi
 
 x_dir=""
Index: apps/e/enlightenment-config.in
===================================================================
RCS file: /var/cvs/e/e17/apps/e/enlightenment-config.in,v
retrieving revision 1.7
diff -u -r1.7 enlightenment-config.in
--- apps/e/enlightenment-config.in	3 Sep 2005 23:31:19 -0000	1.7
+++ apps/e/enlightenment-config.in	10 Jun 2006 14:51:40 -0000
@@ -39,7 +39,7 @@
       echo @VERSION@
       ;;
     --cflags)
-      includes="-I@includedir@ -I@includedir@/enlightenment"
+      includes="-I@prefix@/include -I@prefix@/include/enlightenment"
       echo $includes @e_cflags@
       ;;
     --libs)
@@ -51,7 +51,7 @@
       echo $dir
       ;;
     --config-apps-dir)
-      dir="@datadir@/@PACKAGE@/config-apps"
+      dir="@prefix@/share/@PACKAGE@/config-apps"
       echo $dir
       ;;
     *)
cvs diff: Diffing apps/e/data
cvs diff: Diffing apps/e/data/fonts
cvs diff: Diffing apps/e/data/icons
cvs diff: Diffing apps/e/data/icons/images
cvs diff: Diffing apps/e/data/images
cvs diff: Diffing apps/e/data/init
cvs diff: Diffing apps/e/data/init/images
cvs diff: Diffing apps/e/data/input_methods
cvs diff: Diffing apps/e/data/other
cvs diff: Diffing apps/e/data/themes
cvs diff: Diffing apps/e/data/themes/images
cvs diff: Diffing apps/e/data/xsession
cvs diff: Diffing apps/e/debian
cvs diff: Diffing apps/e/doc
cvs diff: Diffing apps/e/intl
cvs diff: Diffing apps/e/lib
cvs diff: Diffing apps/e/m4
cvs diff: Diffing apps/e/po
cvs diff: Diffing apps/e/src
cvs diff: Diffing apps/e/src/bin
cvs diff: Diffing apps/e/src/lib
cvs diff: Diffing apps/e/src/modules
cvs diff: Diffing apps/e/src/modules/battery
cvs diff: Diffing apps/e/src/modules/clock
cvs diff: Diffing apps/e/src/modules/cpufreq
cvs diff: Diffing apps/e/src/modules/dropshadow
cvs diff: Diffing apps/e/src/modules/ibar
cvs diff: Diffing apps/e/src/modules/ibox
cvs diff: Diffing apps/e/src/modules/itray
cvs diff: Diffing apps/e/src/modules/pager
cvs diff: Diffing apps/e/src/modules/start
cvs diff: Diffing apps/e/src/modules/temperature
cvs diff: Diffing apps/e/src/preload
cvs diff: Diffing apps/e_utils
Index: apps/e_utils/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/e_utils/configure.in,v
retrieving revision 1.25
diff -u -r1.25 configure.in
--- apps/e_utils/configure.in	5 Jun 2006 17:02:08 -0000	1.25
+++ apps/e_utils/configure.in	10 Jun 2006 14:51:46 -0000
@@ -71,15 +71,12 @@
 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 installed data destination")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
-  fi
+if test "x${prefix}" = "xNONE"; then
+   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", "Package installed data destination")
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", "Package installed data destination")
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
 fi
+
 	  
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
 #AC_SUBST(dlopen_libs)
cvs diff: Diffing apps/e_utils/data
cvs diff: Diffing apps/e_utils/data/e17genmenu
cvs diff: Diffing apps/e_utils/data/e17genmenu/icons
cvs diff: Diffing apps/e_utils/data/emblem
cvs diff: Diffing apps/e_utils/data/emblem/default
cvs diff: Diffing apps/e_utils/data/emblem/default/images
cvs diff: Diffing apps/e_utils/data/emblem/default/macros
cvs diff: Diffing apps/e_utils/data/emblem/default/parts
cvs diff: Diffing apps/e_utils/data/emblem/default/programs
cvs diff: Diffing apps/e_utils/data/emblem/fonts
cvs diff: Diffing apps/e_utils/data/emblem/gant
cvs diff: Diffing apps/e_utils/data/emblem/gant/images
cvs diff: Diffing apps/e_utils/data/entangle
cvs diff: Diffing apps/e_utils/data/entangle/default
cvs diff: Diffing apps/e_utils/data/entangle/default/images
cvs diff: Diffing apps/e_utils/data/entangle/default/macros
cvs diff: Diffing apps/e_utils/data/entangle/default/parts
cvs diff: Diffing apps/e_utils/data/entangle/default/programs
cvs diff: Diffing apps/e_utils/data/entangle/fonts
cvs diff: Diffing apps/e_utils/data/exige
cvs diff: Diffing apps/e_utils/data/exige/default
cvs diff: Diffing apps/e_utils/data/exige/default/fonts
cvs diff: Diffing apps/e_utils/data/exige/default/images
cvs diff: Diffing apps/e_utils/data/exige/default/macros
cvs diff: Diffing apps/e_utils/data/exige/default/parts
cvs diff: Diffing apps/e_utils/data/exige/default/programs
cvs diff: Diffing apps/e_utils/debian
cvs diff: Diffing apps/e_utils/m4
cvs diff: Diffing apps/e_utils/src
cvs diff: Diffing apps/e_utils/src/bin
cvs diff: Diffing apps/e_utils/src/bin/e17genmenu
cvs diff: Diffing apps/e_utils/src/bin/e17setroot
cvs diff: Diffing apps/e_utils/src/bin/eapp_edit
cvs diff: Diffing apps/e_utils/src/bin/emblem
cvs diff: Diffing apps/e_utils/src/bin/entangle
cvs diff: Diffing apps/e_utils/src/bin/ethemes
cvs diff: Diffing apps/e_utils/src/bin/exige
cvs diff: Diffing apps/eclair
Index: apps/eclair/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/eclair/configure.in,v
retrieving revision 1.15
diff -u -r1.15 configure.in
--- apps/eclair/configure.in	10 Oct 2005 20:09:26 -0000	1.15
+++ apps/eclair/configure.in	10 Jun 2006 14:51:47 -0000
@@ -44,14 +44,10 @@
 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_DIR])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [PACKAGE_DATA_DIR])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/eclair/data
cvs diff: Diffing apps/eclair/data/fonts
cvs diff: Diffing apps/eclair/data/icons
cvs diff: Diffing apps/eclair/data/themes
cvs diff: Diffing apps/eclair/data/themes/default
cvs diff: Diffing apps/eclair/data/themes/default/fonts
cvs diff: Diffing apps/eclair/data/themes/default/groups
cvs diff: Diffing apps/eclair/data/themes/default/images
cvs diff: Diffing apps/eclair/data/themes/default/parts
cvs diff: Diffing apps/eclair/data/themes/default/programs
cvs diff: Diffing apps/eclair/data/themes/default/scripts
cvs diff: Diffing apps/eclair/data/themes/gant
cvs diff: Diffing apps/eclair/data/themes/gant/fonts
cvs diff: Diffing apps/eclair/data/themes/gant/groups
cvs diff: Diffing apps/eclair/data/themes/gant/images
cvs diff: Diffing apps/eclair/data/themes/gant/parts
cvs diff: Diffing apps/eclair/data/themes/gant/programs
cvs diff: Diffing apps/eclair/data/themes/gant/scripts
cvs diff: Diffing apps/eclair/data/themes/swallow_me
cvs diff: Diffing apps/eclair/data/themes/swallow_me/fonts
cvs diff: Diffing apps/eclair/data/themes/swallow_me/images
cvs diff: Diffing apps/eclair/data/themes/swallow_me/parts
cvs diff: Diffing apps/eclair/data/widget_themes
cvs diff: Diffing apps/eclair/data/widget_themes/default
cvs diff: Diffing apps/eclair/data/widget_themes/default/fonts
cvs diff: Diffing apps/eclair/data/widget_themes/default/images
cvs diff: Diffing apps/eclair/data/wsz2edj
cvs diff: Diffing apps/eclair/debian
cvs diff: Diffing apps/eclair/src
cvs diff: Diffing apps/eclair/src/eclair_wsz2edj
cvs diff: Diffing apps/elation
Index: apps/elation/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/elation/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- apps/elation/configure.in	13 Oct 2005 02:19:36 -0000	1.5
+++ apps/elation/configure.in	10 Jun 2006 14:51:49 -0000
@@ -49,14 +49,10 @@
 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}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Package Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 	  
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/elation/data
cvs diff: Diffing apps/elation/debian
cvs diff: Diffing apps/elation/m4
cvs diff: Diffing apps/elation/src
cvs diff: Diffing apps/elation/src/bin
cvs diff: Diffing apps/elation/src/modules
cvs diff: Diffing apps/elicit
Index: apps/elicit/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/elicit/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- apps/elicit/configure.in	30 Dec 2005 04:12:51 -0000	1.11
+++ apps/elicit/configure.in	10 Jun 2006 14:51:49 -0000
@@ -28,14 +28,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared data directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/elicit/data
cvs diff: Diffing apps/elicit/data/themes
cvs diff: Diffing apps/elicit/data/themes/spring
cvs diff: Diffing apps/elicit/data/themes/spring/fonts
cvs diff: Diffing apps/elicit/data/themes/spring/img
cvs diff: Diffing apps/elicit/data/themes/spring/macros
cvs diff: Diffing apps/elicit/data/themes/spring/parts
cvs diff: Diffing apps/elicit/data/themes/spring/programs
cvs diff: Diffing apps/elicit/data/themes/summer
cvs diff: Diffing apps/elicit/data/themes/summer/fonts
cvs diff: Diffing apps/elicit/data/themes/summer/groups
cvs diff: Diffing apps/elicit/data/themes/summer/img
cvs diff: Diffing apps/elicit/data/themes/summer/macros
cvs diff: Diffing apps/elicit/data/themes/summer/parts
cvs diff: Diffing apps/elicit/data/themes/summer/programs
cvs diff: Diffing apps/elicit/data/themes/winter
cvs diff: Diffing apps/elicit/data/themes/winter/fonts
cvs diff: Diffing apps/elicit/data/themes/winter/groups
cvs diff: Diffing apps/elicit/data/themes/winter/img
cvs diff: Diffing apps/elicit/data/themes/winter/macros
cvs diff: Diffing apps/elicit/data/themes/winter/parts
cvs diff: Diffing apps/elicit/data/themes/winter/programs
cvs diff: Diffing apps/elicit/debian
cvs diff: Diffing apps/elicit/src
cvs diff: Diffing apps/enscribe
Index: apps/enscribe/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/enscribe/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- apps/enscribe/configure.in	30 Oct 2005 07:56:13 -0000	1.5
+++ apps/enscribe/configure.in	10 Jun 2006 14:51:50 -0000
@@ -45,14 +45,10 @@
 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_DIR])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [PACKAGE_DATA_DIR])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/enscribe/data
cvs diff: Diffing apps/enscribe/debian
cvs diff: Diffing apps/enscribe/doc
cvs diff: Diffing apps/enscribe/doc/img
cvs diff: Diffing apps/enscribe/src
cvs diff: Diffing apps/enscribe/src/bin
cvs diff: Diffing apps/entice
Index: apps/entice/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/entice/configure.in,v
retrieving revision 1.21
diff -u -r1.21 configure.in
--- apps/entice/configure.in	25 Oct 2005 05:04:27 -0000	1.21
+++ apps/entice/configure.in	10 Jun 2006 14:51:50 -0000
@@ -28,14 +28,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared data directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/entice/data
cvs diff: Diffing apps/entice/data/fonts
cvs diff: Diffing apps/entice/data/images
cvs diff: Diffing apps/entice/data/themes
cvs diff: Diffing apps/entice/data/themes/artifakt
cvs diff: Diffing apps/entice/data/themes/artifakt/embryo
cvs diff: Diffing apps/entice/data/themes/artifakt/fonts
cvs diff: Diffing apps/entice/data/themes/artifakt/images
cvs diff: Diffing apps/entice/data/themes/artifakt/macros
cvs diff: Diffing apps/entice/data/themes/artifakt/parts
cvs diff: Diffing apps/entice/data/themes/artifakt/programs
cvs diff: Diffing apps/entice/data/themes/default
cvs diff: Diffing apps/entice/data/themes/default/embryo
cvs diff: Diffing apps/entice/data/themes/default/hashes
cvs diff: Diffing apps/entice/data/themes/default/macros
cvs diff: Diffing apps/entice/data/themes/default/parts
cvs diff: Diffing apps/entice/data/themes/default/programs
cvs diff: Diffing apps/entice/debian
cvs diff: Diffing apps/entice/doc
cvs diff: Diffing apps/entice/doc/images
cvs diff: Diffing apps/entice/m4
cvs diff: Diffing apps/entice/po
cvs diff: Diffing apps/entice/src
cvs diff: Diffing apps/entice/src/bin
cvs diff: Diffing apps/entrance
Index: apps/entrance/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.56
diff -u -r1.56 configure.in
--- apps/entrance/configure.in	3 Jun 2006 07:24:49 -0000	1.56
+++ apps/entrance/configure.in	10 Jun 2006 14:51:52 -0000
@@ -15,7 +15,7 @@
 	AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", [Install prefix])
 fi
 
-AC_EXPAND_DIR(PACKAGE_DATA_DIR, "$datadir/${PACKAGE}")
+AC_EXPAND_DIR(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
 AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR", [Shared data directory])
 AC_EXPAND_DIR(PACKAGE_LIB_DIR, "$bindir")
 AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "$PACKAGE_BIN_DIR", [Location of binaries])
cvs diff: Diffing apps/entrance/config
cvs diff: Diffing apps/entrance/config/init.d
cvs diff: Diffing apps/entrance/config/pam.d
cvs diff: Diffing apps/entrance/data
cvs diff: Diffing apps/entrance/data/config
cvs diff: Diffing apps/entrance/data/fonts
cvs diff: Diffing apps/entrance/data/images
cvs diff: Diffing apps/entrance/data/images/sessions
cvs diff: Diffing apps/entrance/data/themes
cvs diff: Diffing apps/entrance/data/themes/darkrock
cvs diff: Diffing apps/entrance/data/themes/darkrock/img
cvs diff: Diffing apps/entrance/data/themes/default
cvs diff: Diffing apps/entrance/data/themes/default/img
cvs diff: Diffing apps/entrance/data/users
cvs diff: Diffing apps/entrance/data/users/default
cvs diff: Diffing apps/entrance/data/users/default/images
cvs diff: Diffing apps/entrance/debian
cvs diff: Diffing apps/entrance/debian/etc
cvs diff: Diffing apps/entrance/doc
cvs diff: Diffing apps/entrance/doc/images
cvs diff: Diffing apps/entrance/m4
cvs diff: Diffing apps/entrance/src
cvs diff: Diffing apps/entrance/src/client
cvs diff: Diffing apps/entrance/src/daemon
cvs diff: Diffing apps/euphoria
cvs diff: Diffing apps/euphoria/bin
cvs diff: Diffing apps/euphoria/data
cvs diff: Diffing apps/euphoria/data/fonts
cvs diff: Diffing apps/euphoria/data/themes
cvs diff: Diffing apps/euphoria/data/themes/default
cvs diff: Diffing apps/euphoria/data/themes/default/images
cvs diff: Diffing apps/euphoria/data/themes/iio
cvs diff: Diffing apps/euphoria/data/themes/iio/collections
cvs diff: Diffing apps/euphoria/data/themes/iio/fonts
cvs diff: Diffing apps/euphoria/data/themes/iio/hashes
cvs diff: Diffing apps/euphoria/data/themes/iio/img
cvs diff: Diffing apps/euphoria/data/themes/iio/macros
cvs diff: Diffing apps/euphoria/data/themes/iio/programs
cvs diff: Diffing apps/euphoria/data/themes/streamline
cvs diff: Diffing apps/euphoria/data/themes/streamline/images
cvs diff: Diffing apps/euphoria/data/themes/winter
cvs diff: Diffing apps/euphoria/data/themes/winter/groups
cvs diff: Diffing apps/euphoria/data/themes/winter/images
cvs diff: Diffing apps/euphoria/data/themes/winter/img
cvs diff: Diffing apps/euphoria/data/themes/winter/macros
cvs diff: Diffing apps/euphoria/data/themes/winter/parts
cvs diff: Diffing apps/euphoria/data/themes/winter/programs
cvs diff: Diffing apps/euphoria/lib
cvs diff: Diffing apps/evfs
Index: apps/evfs/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/evfs/configure.in,v
retrieving revision 1.22
diff -u -r1.22 configure.in
--- apps/evfs/configure.in	21 Apr 2006 15:10:16 -0000	1.22
+++ apps/evfs/configure.in	10 Jun 2006 14:51:56 -0000
@@ -207,14 +207,10 @@
 
 
 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}", "Data directory")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Data directory")
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", "Data directory")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set the package lib dir
cvs diff: Diffing apps/evfs/debian
cvs diff: Diffing apps/evfs/doc
cvs diff: Diffing apps/evfs/m4
cvs diff: Diffing apps/evfs/src
cvs diff: Diffing apps/evfs/src/bin
cvs diff: Diffing apps/evfs/src/common
cvs diff: Diffing apps/evfs/src/demo
cvs diff: Diffing apps/evfs/src/include
cvs diff: Diffing apps/evfs/src/lib
cvs diff: Diffing apps/evfs/src/plugins
cvs diff: Diffing apps/evfs/src/plugins/file
cvs diff: Diffing apps/evfs/src/plugins/meta
cvs diff: Diffing apps/examine
Index: apps/examine/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/examine/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- apps/examine/configure.in	13 Oct 2005 02:03:22 -0000	1.4
+++ apps/examine/configure.in	10 Jun 2006 14:51:57 -0000
@@ -51,14 +51,10 @@
 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}", [Data dir])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Data dir])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Data dir])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/examine/debian
cvs diff: Diffing apps/examine/doc
cvs diff: Diffing apps/examine/doc/img
cvs diff: Diffing apps/examine/m4
cvs diff: Diffing apps/examine/src
cvs diff: Diffing apps/express
Index: apps/express/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/express/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- apps/express/configure.in	13 Oct 2005 02:52:49 -0000	1.4
+++ apps/express/configure.in	10 Jun 2006 14:51:57 -0000
@@ -28,14 +28,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared data directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/express/data
cvs diff: Diffing apps/express/data/icons
cvs diff: Diffing apps/express/data/themes
cvs diff: Diffing apps/express/data/themes/winter
cvs diff: Diffing apps/express/data/themes/winter/fonts
cvs diff: Diffing apps/express/data/themes/winter/img
cvs diff: Diffing apps/express/debian
cvs diff: Diffing apps/express/m4
cvs diff: Diffing apps/express/src
cvs diff: Diffing apps/iconbar
Index: apps/iconbar/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/iconbar/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- apps/iconbar/configure.in	13 Oct 2005 02:09:05 -0000	1.11
+++ apps/iconbar/configure.in	10 Jun 2006 14:51:57 -0000
@@ -33,14 +33,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared data directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing apps/iconbar/data
cvs diff: Diffing apps/iconbar/data/icons
cvs diff: Diffing apps/iconbar/data/images
cvs diff: Diffing apps/iconbar/debian
cvs diff: Diffing apps/iconbar/src
cvs diff: Diffing apps/imlib2_tools
cvs diff: Diffing apps/imlib2_tools/debian
cvs diff: Diffing apps/imlib2_tools/m4
cvs diff: Diffing apps/imlib2_tools/src
cvs diff: Diffing apps/med
Index: apps/med/configure.in
===================================================================
RCS file: /var/cvs/e/e17/apps/med/configure.in,v
retrieving revision 1.1
diff -u -r1.1 configure.in
--- apps/med/configure.in	10 Oct 2001 03:02:32 -0000	1.1
+++ apps/med/configure.in	10 Jun 2006 14:51:58 -0000
@@ -16,14 +16,10 @@
 AM_CONFIG_HEADER(config.h)
 
 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/${PARENT_PACKAGE}")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PARENT_PACKAGE}")
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PARENT_PACKAGE}")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
 fi
 
 
cvs diff: Diffing apps/med/debian
cvs diff: Diffing apps/med/src
cvs diff: Diffing docs
cvs diff: Diffing docs/api
cvs diff: Diffing docs/api/ecrin
cvs diff: Diffing docs/api/ecrin/m4
cvs diff: Diffing docs/api/ecrin/src
cvs diff: Diffing docs/api/ecrin/src/bin
cvs diff: Diffing docs/api/tools
cvs diff: Diffing docs/cookbook
cvs diff: Diffing docs/cookbook/pre-rendered
cvs diff: Diffing docs/cookbook/translations
cvs diff: Diffing docs/cookbook/translations/es
cvs diff: Diffing docs/cookbook/translations/es/xml
cvs diff: Diffing docs/cookbook/translations/es/xml/ecore
cvs diff: Diffing docs/cookbook/translations/es/xml/edb
cvs diff: Diffing docs/cookbook/translations/es/xml/edje
cvs diff: Diffing docs/cookbook/translations/es/xml/edje_edc
cvs diff: Diffing docs/cookbook/translations/es/xml/emotion
cvs diff: Diffing docs/cookbook/translations/es/xml/esmart
cvs diff: Diffing docs/cookbook/translations/es/xml/etox
cvs diff: Diffing docs/cookbook/translations/es/xml/evas
cvs diff: Diffing docs/cookbook/translations/es/xml/evoak
cvs diff: Diffing docs/cookbook/translations/es/xml/ewl
cvs diff: Diffing docs/cookbook/translations/es/xml/imlib
cvs diff: Diffing docs/cookbook/translations/es/xml/thumbs
cvs diff: Diffing docs/cookbook/translations/fr
cvs diff: Diffing docs/cookbook/translations/fr/xml
cvs diff: Diffing docs/cookbook/translations/fr/xml/ecore
cvs diff: Diffing docs/cookbook/translations/fr/xml/edb
cvs diff: Diffing docs/cookbook/translations/fr/xml/edje
cvs diff: Diffing docs/cookbook/translations/fr/xml/edje_edc
cvs diff: Diffing docs/cookbook/translations/fr/xml/emotion
cvs diff: Diffing docs/cookbook/translations/fr/xml/esmart
cvs diff: Diffing docs/cookbook/translations/fr/xml/etox
cvs diff: Diffing docs/cookbook/translations/fr/xml/evas
cvs diff: Diffing docs/cookbook/translations/fr/xml/evoak
cvs diff: Diffing docs/cookbook/translations/fr/xml/ewl
cvs diff: Diffing docs/cookbook/translations/fr/xml/imlib
cvs diff: Diffing docs/cookbook/translations/fr/xml/thumbs
cvs diff: Diffing docs/cookbook/translations/pt-br
cvs diff: Diffing docs/cookbook/translations/pt-br/xml
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/ecore
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/edb
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/edje
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/edje_edc
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/emotion
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/esmart
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/etox
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/evas
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/evoak
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/ewl
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/imlib
cvs diff: Diffing docs/cookbook/translations/pt-br/xml/thumbs
cvs diff: Diffing docs/cookbook/xml
cvs diff: Diffing docs/cookbook/xml/ecore
cvs diff: Diffing docs/cookbook/xml/edb
cvs diff: Diffing docs/cookbook/xml/edje
cvs diff: Diffing docs/cookbook/xml/edje_edc
cvs diff: Diffing docs/cookbook/xml/emotion
cvs diff: Diffing docs/cookbook/xml/esmart
cvs diff: Diffing docs/cookbook/xml/etox
cvs diff: Diffing docs/cookbook/xml/evas
cvs diff: Diffing docs/cookbook/xml/evoak
cvs diff: Diffing docs/cookbook/xml/ewl
cvs diff: Diffing docs/cookbook/xml/imlib
cvs diff: Diffing docs/cookbook/xml/thumbs
cvs diff: Diffing docs/edjebook
cvs diff: Diffing docs/edjebook/img
cvs diff: Diffing docs/edjebook/pre-rendered
cvs diff: Diffing docs/edjebook/xml
cvs diff: Diffing docs/ewlbook
cvs diff: Diffing docs/ewlbook/examples
cvs diff: Diffing docs/ewlbook/examples/create_window
cvs diff: Diffing docs/ewlbook/examples/hello_world
cvs diff: Diffing docs/ewlbook/img
cvs diff: Diffing docs/ewlbook/pre-rendered
cvs diff: Diffing docs/ewlbook/translations
cvs diff: Diffing docs/ewlbook/translations/es
cvs diff: Diffing docs/ewlbook/translations/es/img
cvs diff: Diffing docs/ewlbook/translations/es/xml
cvs diff: Diffing docs/ewlbook/xml
cvs diff: Diffing docs/ewlbook/xml/widgets
cvs diff: Diffing docs/presentations
cvs diff: Diffing libs
cvs diff: Diffing libs/ecore
Index: libs/ecore/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.138
diff -u -r1.138 configure.in
--- libs/ecore/configure.in	19 May 2006 09:27:33 -0000	1.138
+++ libs/ecore/configure.in	10 Jun 2006 14:52:02 -0000
@@ -52,14 +52,10 @@
 
 							
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/ecore/ecore-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/ecore/ecore-config.in,v
retrieving revision 1.13
diff -u -r1.13 ecore-config.in
--- libs/ecore/ecore-config.in	16 Apr 2006 01:42:00 -0000	1.13
+++ libs/ecore/ecore-config.in	10 Jun 2006 14:52:02 -0000
@@ -42,8 +42,8 @@
       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@
       ;;
cvs diff: Diffing libs/ecore/data
cvs diff: Diffing libs/ecore/data/fonts
cvs diff: Diffing libs/ecore/data/images
cvs diff: Diffing libs/ecore/data/pointers
cvs diff: Diffing libs/ecore/debian
cvs diff: Diffing libs/ecore/doc
cvs diff: Diffing libs/ecore/doc/img
cvs diff: Diffing libs/ecore/examples
cvs diff: Diffing libs/ecore/m4
cvs diff: Diffing libs/ecore/src
cvs diff: Diffing libs/ecore/src/bin
cvs diff: Diffing libs/ecore/src/lib
cvs diff: Diffing libs/ecore/src/lib/ecore
cvs diff: Diffing libs/ecore/src/lib/ecore_con
cvs diff: Diffing libs/ecore/src/lib/ecore_config
cvs diff: Diffing libs/ecore/src/lib/ecore_dbus
cvs diff: Diffing libs/ecore/src/lib/ecore_directfb
cvs diff: Diffing libs/ecore/src/lib/ecore_evas
cvs diff: Diffing libs/ecore/src/lib/ecore_fb
cvs diff: Diffing libs/ecore/src/lib/ecore_file
cvs diff: Diffing libs/ecore/src/lib/ecore_ipc
cvs diff: Diffing libs/ecore/src/lib/ecore_job
cvs diff: Diffing libs/ecore/src/lib/ecore_txt
cvs diff: Diffing libs/ecore/src/lib/ecore_x
cvs diff: Diffing libs/edb
Index: libs/edb/edb-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/edb/edb-config.in,v
retrieving revision 1.3
diff -u -r1.3 edb-config.in
--- libs/edb/edb-config.in	23 Jun 2003 22:53:01 -0000	1.3
+++ libs/edb/edb-config.in	10 Jun 2006 14:52:03 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/edb/debian
cvs diff: Diffing libs/edb/m4
cvs diff: Diffing libs/edb/src
cvs diff: Diffing libs/edb/test
cvs diff: Diffing libs/edb/tools
cvs diff: Diffing libs/edb/tools/edb_gtk_ed
cvs diff: Diffing libs/edje
Index: libs/edje/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/edje/configure.in,v
retrieving revision 1.61
diff -u -r1.61 configure.in
--- libs/edje/configure.in	19 May 2006 09:27:33 -0000	1.61
+++ libs/edje/configure.in	10 Jun 2006 14:52:04 -0000
@@ -65,16 +65,12 @@
     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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/edje/edje-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/edje/edje-config.in,v
retrieving revision 1.4
diff -u -r1.4 edje-config.in
--- libs/edje/edje-config.in	4 Sep 2005 18:55:56 -0000	1.4
+++ libs/edje/edje-config.in	10 Jun 2006 14:52:04 -0000
@@ -39,8 +39,8 @@
       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@
       ;;
@@ -49,7 +49,7 @@
       echo $libdirs -ledje
       ;;
     --datadir)
-      echo @datadir@/edje
+      echo @prefix@/share/edje
       ;;
     *)
       echo "${usage}" 1>&2
cvs diff: Diffing libs/edje/data
cvs diff: Diffing libs/edje/data/images
cvs diff: Diffing libs/edje/data/include
cvs diff: Diffing libs/edje/data/src
cvs diff: Diffing libs/edje/data/template
cvs diff: Diffing libs/edje/data/template/embryo
cvs diff: Diffing libs/edje/data/template/fonts
cvs diff: Diffing libs/edje/data/template/hashes
cvs diff: Diffing libs/edje/data/template/images
cvs diff: Diffing libs/edje/data/template/macros
cvs diff: Diffing libs/edje/data/template/parts
cvs diff: Diffing libs/edje/data/template/programs
cvs diff: Diffing libs/edje/data/test
cvs diff: Diffing libs/edje/data/test/fonts
cvs diff: Diffing libs/edje/data/test/images
cvs diff: Diffing libs/edje/debian
cvs diff: Diffing libs/edje/doc
cvs diff: Diffing libs/edje/doc/img
cvs diff: Diffing libs/edje/m4
cvs diff: Diffing libs/edje/src
cvs diff: Diffing libs/edje/src/bin
cvs diff: Diffing libs/edje/src/lib
cvs diff: Diffing libs/eet
Index: libs/eet/eet-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/eet/eet-config.in,v
retrieving revision 1.5
diff -u -r1.5 eet-config.in
--- libs/eet/eet-config.in	15 Apr 2004 07:58:37 -0000	1.5
+++ libs/eet/eet-config.in	10 Jun 2006 14:52:05 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/eet/debian
cvs diff: Diffing libs/eet/doc
cvs diff: Diffing libs/eet/doc/img
cvs diff: Diffing libs/eet/m4
cvs diff: Diffing libs/eet/src
cvs diff: Diffing libs/eet/src/bin
cvs diff: Diffing libs/eet/src/lib
cvs diff: Diffing libs/embryo
Index: libs/embryo/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/embryo/configure.in,v
retrieving revision 1.37
diff -u -r1.37 configure.in
--- libs/embryo/configure.in	19 May 2006 09:27:33 -0000	1.37
+++ libs/embryo/configure.in	10 Jun 2006 14:52:05 -0000
@@ -66,14 +66,10 @@
 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}", [Shared Data Directory] )
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/embryo/embryo-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/embryo/embryo-config.in,v
retrieving revision 1.1
diff -u -r1.1 embryo-config.in
--- libs/embryo/embryo-config.in	24 Mar 2004 09:48:28 -0000	1.1
+++ libs/embryo/embryo-config.in	10 Jun 2006 14:52:05 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/embryo/debian
cvs diff: Diffing libs/embryo/doc
cvs diff: Diffing libs/embryo/doc/img
cvs diff: Diffing libs/embryo/examples
cvs diff: Diffing libs/embryo/include
cvs diff: Diffing libs/embryo/m4
cvs diff: Diffing libs/embryo/src
cvs diff: Diffing libs/embryo/src/bin
cvs diff: Diffing libs/embryo/src/lib
cvs diff: Diffing libs/emotion
Index: libs/emotion/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/emotion/configure.in,v
retrieving revision 1.37
diff -u -r1.37 configure.in
--- libs/emotion/configure.in	21 Apr 2006 00:53:13 -0000	1.37
+++ libs/emotion/configure.in	10 Jun 2006 14:52:06 -0000
@@ -47,16 +47,12 @@
     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.
Index: libs/emotion/emotion-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/emotion/emotion-config.in,v
retrieving revision 1.5
diff -u -r1.5 emotion-config.in
--- libs/emotion/emotion-config.in	4 Sep 2005 18:58:11 -0000	1.5
+++ libs/emotion/emotion-config.in	10 Jun 2006 14:52:06 -0000
@@ -39,8 +39,8 @@
       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@
       ;;
cvs diff: Diffing libs/emotion/data
cvs diff: Diffing libs/emotion/debian
cvs diff: Diffing libs/emotion/doc
cvs diff: Diffing libs/emotion/doc/img
cvs diff: Diffing libs/emotion/m4
cvs diff: Diffing libs/emotion/src
cvs diff: Diffing libs/emotion/src/bin
cvs diff: Diffing libs/emotion/src/lib
cvs diff: Diffing libs/emotion/src/modules
cvs diff: Diffing libs/engrave
Index: libs/engrave/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/engrave/configure.in,v
retrieving revision 1.7
diff -u -r1.7 configure.in
--- libs/engrave/configure.in	25 Oct 2005 04:44:51 -0000	1.7
+++ libs/engrave/configure.in	10 Jun 2006 14:52:07 -0000
@@ -34,16 +34,12 @@
 else
   AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Locale-specific data directory])
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/engrave/engrave-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/engrave/engrave-config.in,v
retrieving revision 1.2
diff -u -r1.2 engrave-config.in
--- libs/engrave/engrave-config.in	4 Sep 2005 18:58:44 -0000	1.2
+++ libs/engrave/engrave-config.in	10 Jun 2006 14:52:07 -0000
@@ -39,8 +39,8 @@
       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@ -I$prefix/include/engrave
       ;;
cvs diff: Diffing libs/engrave/debian
cvs diff: Diffing libs/engrave/doc
cvs diff: Diffing libs/engrave/doc/images
cvs diff: Diffing libs/engrave/m4
cvs diff: Diffing libs/engrave/src
cvs diff: Diffing libs/engrave/src/bin
cvs diff: Diffing libs/engrave/src/lib
cvs diff: Diffing libs/epeg
Index: libs/epeg/epeg-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/epeg/epeg-config.in,v
retrieving revision 1.1
diff -u -r1.1 epeg-config.in
--- libs/epeg/epeg-config.in	29 Oct 2003 12:44:47 -0000	1.1
+++ libs/epeg/epeg-config.in	10 Jun 2006 14:52:07 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/epeg/debian
cvs diff: Diffing libs/epeg/doc
cvs diff: Diffing libs/epeg/doc/img
cvs diff: Diffing libs/epeg/m4
cvs diff: Diffing libs/epeg/src
cvs diff: Diffing libs/epeg/src/bin
cvs diff: Diffing libs/epeg/src/lib
cvs diff: Diffing libs/epsilon
Index: libs/epsilon/epsilon-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/epsilon/epsilon-config.in,v
retrieving revision 1.3
diff -u -r1.3 epsilon-config.in
--- libs/epsilon/epsilon-config.in	4 Sep 2005 18:59:15 -0000	1.3
+++ libs/epsilon/epsilon-config.in	10 Jun 2006 14:52:07 -0000
@@ -39,8 +39,8 @@
       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@ -I$prefix/include
       ;;
cvs diff: Diffing libs/epsilon/debian
cvs diff: Diffing libs/epsilon/doc
cvs diff: Diffing libs/epsilon/doc/images
cvs diff: Diffing libs/epsilon/m4
cvs diff: Diffing libs/epsilon/src
cvs diff: Diffing libs/epsilon/src/bin
cvs diff: Diffing libs/epsilon/src/common
cvs diff: Diffing libs/epsilon/src/include
cvs diff: Diffing libs/epsilon/src/lib
cvs diff: Diffing libs/epsilon/src/lib/exiftags
cvs diff: Diffing libs/epsilon/src/plugins
cvs diff: Diffing libs/esmart
Index: libs/esmart/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/esmart/configure.in,v
retrieving revision 1.15
diff -u -r1.15 configure.in
--- libs/esmart/configure.in	29 Mar 2006 08:00:29 -0000	1.15
+++ libs/esmart/configure.in	10 Jun 2006 14:52:08 -0000
@@ -14,16 +14,12 @@
 AM_PROG_LIBTOOL
 
 dnl Use -Wall if we have gcc.
-
+							
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 if test "x${prefix}" = "xNONE"; then
Index: libs/esmart/esmart-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/esmart/esmart-config.in,v
retrieving revision 1.6
diff -u -r1.6 esmart-config.in
--- libs/esmart/esmart-config.in	4 Sep 2005 19:00:25 -0000	1.6
+++ libs/esmart/esmart-config.in	10 Jun 2006 14:52:08 -0000
@@ -39,8 +39,8 @@
       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@ @ECORE_CFLAGS@ -I$prefix/include
       ;;
cvs diff: Diffing libs/esmart/data
cvs diff: Diffing libs/esmart/data/images
cvs diff: Diffing libs/esmart/debian
cvs diff: Diffing libs/esmart/m4
cvs diff: Diffing libs/esmart/src
cvs diff: Diffing libs/esmart/src/bin
cvs diff: Diffing libs/esmart/src/lib
cvs diff: Diffing libs/esmart/src/lib/esmart_container
cvs diff: Diffing libs/esmart/src/lib/esmart_container/layout
cvs diff: Diffing libs/esmart/src/lib/esmart_container/layout/default
cvs diff: Diffing libs/esmart/src/lib/esmart_container/layout/engage
cvs diff: Diffing libs/esmart/src/lib/esmart_container/layout/entice
cvs diff: Diffing libs/esmart/src/lib/esmart_draggies
cvs diff: Diffing libs/esmart/src/lib/esmart_file_dialog
cvs diff: Diffing libs/esmart/src/lib/esmart_text_entry
cvs diff: Diffing libs/esmart/src/lib/esmart_textarea
cvs diff: Diffing libs/esmart/src/lib/esmart_thumb
cvs diff: Diffing libs/esmart/src/lib/esmart_trans_x11
cvs diff: Diffing libs/etox
cvs diff: Diffing libs/etox/data
cvs diff: Diffing libs/etox/data/fonts
cvs diff: Diffing libs/etox/data/images
cvs diff: Diffing libs/etox/data/styles
cvs diff: Diffing libs/etox/debian
cvs diff: Diffing libs/etox/doc
cvs diff: Diffing libs/etox/doc/figures
cvs diff: Diffing libs/etox/m4
cvs diff: Diffing libs/etox/src
cvs diff: Diffing libs/etox/src/style
cvs diff: Diffing libs/etox/test
cvs diff: Diffing libs/etox/test/img
cvs diff: Diffing libs/etox/test/style
cvs diff: Diffing libs/evas
Index: libs/evas/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.159
diff -u -r1.159 configure.in
--- libs/evas/configure.in	7 Jun 2006 23:30:14 -0000	1.159
+++ libs/evas/configure.in	10 Jun 2006 14:52:12 -0000
@@ -56,14 +56,10 @@
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/evas/evas-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/evas/evas-config.in,v
retrieving revision 1.8
diff -u -r1.8 evas-config.in
--- libs/evas/evas-config.in	26 May 2003 22:56:39 -0000	1.8
+++ libs/evas/evas-config.in	10 Jun 2006 14:52:12 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/evas/data
cvs diff: Diffing libs/evas/debian
cvs diff: Diffing libs/evas/doc
cvs diff: Diffing libs/evas/doc/img
cvs diff: Diffing libs/evas/m4
cvs diff: Diffing libs/evas/proj
cvs diff: Diffing libs/evas/proj/win32_gdi
cvs diff: Diffing libs/evas/src
cvs diff: Diffing libs/evas/src/bin
cvs diff: Diffing libs/evas/src/bin/evas_software_win32
cvs diff: Diffing libs/evas/src/lib
cvs diff: Diffing libs/evas/src/lib/canvas
cvs diff: Diffing libs/evas/src/lib/data
cvs diff: Diffing libs/evas/src/lib/engines
cvs diff: Diffing libs/evas/src/lib/engines/common
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_add
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_blend
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_copy
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_mask
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_mul
cvs diff: Diffing libs/evas/src/lib/engines/common/evas_op_sub
cvs diff: Diffing libs/evas/src/lib/file
cvs diff: Diffing libs/evas/src/lib/imaging
cvs diff: Diffing libs/evas/src/lib/include
cvs diff: Diffing libs/evas/src/modules
cvs diff: Diffing libs/evas/src/modules/engines
cvs diff: Diffing libs/evas/src/modules/engines/buffer
cvs diff: Diffing libs/evas/src/modules/engines/cairo_common
cvs diff: Diffing libs/evas/src/modules/engines/cairo_x11
cvs diff: Diffing libs/evas/src/modules/engines/directfb
cvs diff: Diffing libs/evas/src/modules/engines/fb
cvs diff: Diffing libs/evas/src/modules/engines/gl_common
cvs diff: Diffing libs/evas/src/modules/engines/gl_x11
cvs diff: Diffing libs/evas/src/modules/engines/software_generic
cvs diff: Diffing libs/evas/src/modules/engines/software_qtopia
cvs diff: Diffing libs/evas/src/modules/engines/software_win32_gdi
cvs diff: Diffing libs/evas/src/modules/engines/software_x11
cvs diff: Diffing libs/evas/src/modules/engines/software_xcb
cvs diff: Diffing libs/evas/src/modules/engines/xrender_x11
cvs diff: Diffing libs/evas/src/modules/engines/xrender_xcb
cvs diff: Diffing libs/evas/src/modules/loaders
cvs diff: Diffing libs/evas/src/modules/loaders/edb
cvs diff: Diffing libs/evas/src/modules/loaders/eet
cvs diff: Diffing libs/evas/src/modules/loaders/gif
cvs diff: Diffing libs/evas/src/modules/loaders/jpeg
cvs diff: Diffing libs/evas/src/modules/loaders/png
cvs diff: Diffing libs/evas/src/modules/loaders/tiff
cvs diff: Diffing libs/evas/src/modules/savers
cvs diff: Diffing libs/evas/src/modules/savers/edb
cvs diff: Diffing libs/evas/src/modules/savers/eet
cvs diff: Diffing libs/evas/src/modules/savers/jpeg
cvs diff: Diffing libs/evas/src/modules/savers/png
cvs diff: Diffing libs/evas/src/modules/savers/tiff
cvs diff: Diffing libs/evoak
cvs diff: Diffing libs/evoak/data
cvs diff: Diffing libs/evoak/data/fonts
cvs diff: Diffing libs/evoak/debian
cvs diff: Diffing libs/evoak/doc
cvs diff: Diffing libs/evoak/doc/img
cvs diff: Diffing libs/evoak/m4
cvs diff: Diffing libs/evoak/src
cvs diff: Diffing libs/evoak/src/bin
cvs diff: Diffing libs/evoak/src/lib
cvs diff: Diffing libs/ewl
Index: libs/ewl/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/ewl/configure.in,v
retrieving revision 1.71
diff -u -r1.71 configure.in
--- libs/ewl/configure.in	9 Jun 2006 19:33:13 -0000	1.71
+++ libs/ewl/configure.in	10 Jun 2006 14:52:15 -0000
@@ -29,16 +29,12 @@
 else
   AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale", [Locale data directory])
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_LIB_DIR in config.h.
Index: libs/ewl/ewl-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/ewl/ewl-config.in,v
retrieving revision 1.11
diff -u -r1.11 ewl-config.in
--- libs/ewl/ewl-config.in	11 May 2006 21:37:58 -0000	1.11
+++ libs/ewl/ewl-config.in	10 Jun 2006 14:52:15 -0000
@@ -39,8 +39,8 @@
       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 @EMOTION_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@ @EPSILON_CFLAGS@ -I$prefix/include/ewl
       ;;
cvs diff: Diffing libs/ewl/data
cvs diff: Diffing libs/ewl/data/images
cvs diff: Diffing libs/ewl/data/themes
cvs diff: Diffing libs/ewl/data/themes/default
cvs diff: Diffing libs/ewl/data/themes/default/bits
cvs diff: Diffing libs/ewl/data/themes/default/bits/images
cvs diff: Diffing libs/ewl/data/themes/default/fonts
cvs diff: Diffing libs/ewl/data/themes/e17
cvs diff: Diffing libs/ewl/data/themes/e17/bits
cvs diff: Diffing libs/ewl/data/themes/e17/bits/images
cvs diff: Diffing libs/ewl/data/themes/e17/fonts
cvs diff: Diffing libs/ewl/data/themes/e17/macros
cvs diff: Diffing libs/ewl/data/themes/ewl_embed_test
cvs diff: Diffing libs/ewl/data/themes/ewl_embed_test/bits
cvs diff: Diffing libs/ewl/data/themes/ewl_embed_test/bits/images
cvs diff: Diffing libs/ewl/data/themes/skeleton
cvs diff: Diffing libs/ewl/data/themes/skeleton/bits
cvs diff: Diffing libs/ewl/data/themes/skeleton/bits/images
cvs diff: Diffing libs/ewl/data/themes/skeleton/fonts
cvs diff: Diffing libs/ewl/data/themes/zero
cvs diff: Diffing libs/ewl/data/themes/zero/bits
cvs diff: Diffing libs/ewl/data/themes/zero/bits/images
cvs diff: Diffing libs/ewl/data/themes/zero/fonts
cvs diff: Diffing libs/ewl/debian
cvs diff: Diffing libs/ewl/doc
cvs diff: Diffing libs/ewl/doc/images
cvs diff: Diffing libs/ewl/m4
cvs diff: Diffing libs/ewl/src
cvs diff: Diffing libs/ewl/src/bin
cvs diff: Diffing libs/ewl/src/bin/tests
cvs diff: Diffing libs/ewl/src/engines
cvs diff: Diffing libs/ewl/src/engines/evas_fb
cvs diff: Diffing libs/ewl/src/engines/evas_gl_x11
cvs diff: Diffing libs/ewl/src/engines/evas_software_x11
cvs diff: Diffing libs/ewl/src/engines/x11
cvs diff: Diffing libs/ewl/src/lib
cvs diff: Diffing libs/ewl/test
cvs diff: Diffing libs/ewl/tools
cvs diff: Diffing libs/ewl/tools/ewl_config
cvs diff: Diffing libs/ewl/tools/ewl_edb_ed
cvs diff: Diffing libs/exml
Index: libs/exml/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/exml/configure.in,v
retrieving revision 1.7
diff -u -r1.7 configure.in
--- libs/exml/configure.in	20 Apr 2006 02:31:21 -0000	1.7
+++ libs/exml/configure.in	10 Jun 2006 14:52:18 -0000
@@ -33,14 +33,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: libs/exml/exml-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/exml/exml-config.in,v
retrieving revision 1.3
diff -u -r1.3 exml-config.in
--- libs/exml/exml-config.in	18 Jan 2006 21:51:48 -0000	1.3
+++ libs/exml/exml-config.in	10 Jun 2006 14:52:18 -0000
@@ -39,8 +39,8 @@
       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 @ecore_cflags@
       ;;
cvs diff: Diffing libs/exml/debian
cvs diff: Diffing libs/exml/src
cvs diff: Diffing libs/imlib2
Index: libs/imlib2/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/imlib2/configure.in,v
retrieving revision 1.128
diff -u -r1.128 configure.in
--- libs/imlib2/configure.in	18 Apr 2006 09:38:05 -0000	1.128
+++ libs/imlib2/configure.in	10 Jun 2006 14:52:19 -0000
@@ -94,14 +94,10 @@
 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 installed data destination")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
-  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 installed data destination")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
Index: libs/imlib2/imlib2-config.in
===================================================================
RCS file: /var/cvs/e/e17/libs/imlib2/imlib2-config.in,v
retrieving revision 1.5
diff -u -r1.5 imlib2-config.in
--- libs/imlib2/imlib2-config.in	1 Nov 2004 09:45:27 -0000	1.5
+++ libs/imlib2/imlib2-config.in	10 Jun 2006 14:52:19 -0000
@@ -39,8 +39,8 @@
       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
       ;;
cvs diff: Diffing libs/imlib2/data
cvs diff: Diffing libs/imlib2/data/fonts
cvs diff: Diffing libs/imlib2/data/images
cvs diff: Diffing libs/imlib2/debian
cvs diff: Diffing libs/imlib2/doc
cvs diff: Diffing libs/imlib2/doc/img
cvs diff: Diffing libs/imlib2/m4
cvs diff: Diffing libs/imlib2/src
cvs diff: Diffing libs/imlib2/src/bin
cvs diff: Diffing libs/imlib2/src/lib
cvs diff: Diffing libs/imlib2/src/modules
cvs diff: Diffing libs/imlib2/src/modules/filters
cvs diff: Diffing libs/imlib2/src/modules/loaders
cvs diff: Diffing libs/imlib2_loaders
Index: libs/imlib2_loaders/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/imlib2_loaders/configure.in,v
retrieving revision 1.43
diff -u -r1.43 configure.in
--- libs/imlib2_loaders/configure.in	29 Mar 2006 08:00:30 -0000	1.43
+++ libs/imlib2_loaders/configure.in	10 Jun 2006 14:52:20 -0000
@@ -71,14 +71,10 @@
 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 installed data destination")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
-  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 installed data destination")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
cvs diff: Diffing libs/imlib2_loaders/debian
cvs diff: Diffing libs/imlib2_loaders/m4
cvs diff: Diffing libs/imlib2_loaders/src
cvs diff: Diffing libs/imlib2_loaders/src/modules
cvs diff: Diffing libs/imlib2_loaders/src/modules/loaders
cvs diff: Diffing oe
cvs diff: Diffing oe/packages
cvs diff: Diffing oe/packages/epeg
cvs diff: Diffing oe/packages/ewl
cvs diff: Diffing oe/packages/meta
cvs diff: Diffing proto
cvs diff: Diffing proto/emphasis
Index: proto/emphasis/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/emphasis/configure.in,v
retrieving revision 1.1
diff -u -r1.1 configure.in
--- proto/emphasis/configure.in	6 Jun 2006 11:22:15 -0000	1.1
+++ proto/emphasis/configure.in	10 Jun 2006 14:52:20 -0000
@@ -25,14 +25,10 @@
 LIBS=""
       
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/emphasis/data
cvs diff: Diffing proto/emphasis/data/images
cvs diff: Diffing proto/emphasis/m4
cvs diff: Diffing proto/emphasis/src
cvs diff: Diffing proto/emphasis/src/bin
cvs diff: Diffing proto/empower
Index: proto/empower/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/empower/configure.in,v
retrieving revision 1.3
diff -u -r1.3 configure.in
--- proto/empower/configure.in	8 Jun 2006 05:02:06 -0000	1.3
+++ proto/empower/configure.in	10 Jun 2006 14:52:20 -0000
@@ -28,14 +28,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/empower/debian
cvs diff: Diffing proto/empower/m4
cvs diff: Diffing proto/empower/src
cvs diff: Diffing proto/empower/src/bin
cvs diff: Diffing proto/empower/src/bin/etk
cvs diff: Diffing proto/empower/src/bin/ewl
cvs diff: Diffing proto/enhance
Index: proto/enhance/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/enhance/configure.in,v
retrieving revision 1.2
diff -u -r1.2 configure.in
--- proto/enhance/configure.in	4 Apr 2006 21:03:02 -0000	1.2
+++ proto/enhance/configure.in	10 Jun 2006 14:52:21 -0000
@@ -136,15 +136,10 @@
 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}", "")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", data)
-  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}", data)
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
cvs diff: Diffing proto/enhance/debian
cvs diff: Diffing proto/enhance/examples
cvs diff: Diffing proto/enhance/m4
cvs diff: Diffing proto/enhance/src
cvs diff: Diffing proto/enhance/src/lib
cvs diff: Diffing proto/enity
Index: proto/enity/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/enity/configure.in,v
retrieving revision 1.2
diff -u -r1.2 configure.in
--- proto/enity/configure.in	22 Mar 2006 19:11:10 -0000	1.2
+++ proto/enity/configure.in	10 Jun 2006 14:52:21 -0000
@@ -53,14 +53,10 @@
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/enity/doc
cvs diff: Diffing proto/enity/doc/img
cvs diff: Diffing proto/enity/m4
cvs diff: Diffing proto/enity/src
cvs diff: Diffing proto/enity/src/bin
cvs diff: Diffing proto/enterminus
Index: proto/enterminus/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/enterminus/configure.in,v
retrieving revision 1.3
diff -u -r1.3 configure.in
--- proto/enterminus/configure.in	27 Oct 2005 07:33:11 -0000	1.3
+++ proto/enterminus/configure.in	10 Jun 2006 14:52:21 -0000
@@ -45,14 +45,10 @@
 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}", "Data dir")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Data dir")
-  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}", "Data dir")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/enterminus/data
cvs diff: Diffing proto/enterminus/doc
cvs diff: Diffing proto/enterminus/doc/img
cvs diff: Diffing proto/enterminus/src
cvs diff: Diffing proto/enterminus/src/bin
cvs diff: Diffing proto/entropy
Index: proto/entropy/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/entropy/configure.in,v
retrieving revision 1.11
diff -u -r1.11 configure.in
--- proto/entropy/configure.in	8 Apr 2006 11:42:50 -0000	1.11
+++ proto/entropy/configure.in	10 Jun 2006 14:52:22 -0000
@@ -360,15 +360,10 @@
 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}", "")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", data)
-  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}", data)
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
cvs diff: Diffing proto/entropy/debian
cvs diff: Diffing proto/entropy/docs
cvs diff: Diffing proto/entropy/images
cvs diff: Diffing proto/entropy/m4
cvs diff: Diffing proto/entropy/src
cvs diff: Diffing proto/entropy/src/dialogs
cvs diff: Diffing proto/entropy/src/include
cvs diff: Diffing proto/entropy/src/plugins
cvs diff: Diffing proto/epdf
Index: proto/epdf/epdf-config.in
===================================================================
RCS file: /var/cvs/e/e17/proto/epdf/epdf-config.in,v
retrieving revision 1.1
diff -u -r1.1 epdf-config.in
--- proto/epdf/epdf-config.in	15 Feb 2006 21:45:08 -0000	1.1
+++ proto/epdf/epdf-config.in	10 Jun 2006 14:52:23 -0000
@@ -39,8 +39,8 @@
       echo @PACKAGE_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@ @ECORE_CFLAGS@ @EWL_CFLAGS@ @ETK_CFLAGS@ -I$prefix/include/epdf
       ;;
cvs diff: Diffing proto/epdf/m4
cvs diff: Diffing proto/epdf/src
cvs diff: Diffing proto/epdf/src/bin
cvs diff: Diffing proto/epdf/src/lib
cvs diff: Diffing proto/ephoto
Index: proto/ephoto/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/ephoto/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- proto/ephoto/configure.in	22 May 2006 18:32:14 -0000	1.4
+++ proto/ephoto/configure.in	10 Jun 2006 14:52:23 -0000
@@ -28,14 +28,10 @@
 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}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/ephoto/data
cvs diff: Diffing proto/ephoto/data/images
cvs diff: Diffing proto/ephoto/debian
cvs diff: Diffing proto/ephoto/m4
cvs diff: Diffing proto/ephoto/src
cvs diff: Diffing proto/etk
Index: proto/etk/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/configure.in,v
retrieving revision 1.14
diff -u -r1.14 configure.in
--- proto/etk/configure.in	31 Mar 2006 10:15:15 -0000	1.14
+++ proto/etk/configure.in	10 Jun 2006 14:52:24 -0000
@@ -51,14 +51,10 @@
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
Index: proto/etk/etk-config.in
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/etk-config.in,v
retrieving revision 1.4
diff -u -r1.4 etk-config.in
--- proto/etk/etk-config.in	31 Mar 2006 10:15:15 -0000	1.4
+++ proto/etk/etk-config.in	10 Jun 2006 14:52:24 -0000
@@ -40,8 +40,8 @@
       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@ @ECORE_CFLAGS@ @EDJE_CFLAGS@ -I$prefix/include/etk
       ;;
cvs diff: Diffing proto/etk/data
cvs diff: Diffing proto/etk/data/fonts
cvs diff: Diffing proto/etk/data/icons
cvs diff: Diffing proto/etk/data/icons/default
cvs diff: Diffing proto/etk/data/icons/default/icons
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/actions
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/apps
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/categories
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/devices
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/emblems
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/emotes
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/mimetypes
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/places
cvs diff: Diffing proto/etk/data/icons/default/icons/16x16/status
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/actions
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/apps
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/categories
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/devices
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/emblems
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/emotes
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/mimetypes
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/places
cvs diff: Diffing proto/etk/data/icons/default/icons/22x22/status
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/actions
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/apps
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/categories
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/devices
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/emblems
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/emotes
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/mimetypes
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/places
cvs diff: Diffing proto/etk/data/icons/default/icons/48x48/status
cvs diff: Diffing proto/etk/data/images
cvs diff: Diffing proto/etk/data/stock_icons
cvs diff: Diffing proto/etk/data/stock_icons/default
cvs diff: Diffing proto/etk/data/themes
cvs diff: Diffing proto/etk/data/themes/default
cvs diff: Diffing proto/etk/data/themes/default/fonts
cvs diff: Diffing proto/etk/data/themes/default/images
cvs diff: Diffing proto/etk/data/themes/default/macros
cvs diff: Diffing proto/etk/data/themes/default/widgets
cvs diff: Diffing proto/etk/debian
cvs diff: Diffing proto/etk/doc
cvs diff: Diffing proto/etk/doc/img
cvs diff: Diffing proto/etk/doc/img/nav
cvs diff: Diffing proto/etk/doc/img/widgets
cvs diff: Diffing proto/etk/doc/pages
cvs diff: Diffing proto/etk/intl
cvs diff: Diffing proto/etk/m4
cvs diff: Diffing proto/etk/po
cvs diff: Diffing proto/etk/src
cvs diff: Diffing proto/etk/src/bin
cvs diff: Diffing proto/etk/src/lib
cvs diff: Diffing proto/etk-perl
cvs diff: Diffing proto/etk-perl/etk_test
cvs diff: Diffing proto/etk-perl/etk_test/images
cvs diff: Diffing proto/etk-perl/fallback
cvs diff: Diffing proto/etk-perl/lib
cvs diff: Diffing proto/etk-perl/lib/Etk
cvs diff: Diffing proto/etk-perl/lib/Etk/Combobox
cvs diff: Diffing proto/etk-perl/lib/Etk/Iconbox
cvs diff: Diffing proto/etk-perl/lib/Etk/Menu
cvs diff: Diffing proto/etk-perl/lib/Etk/Menu/Item
cvs diff: Diffing proto/etk-perl/lib/Etk/Tree
cvs diff: Diffing proto/etk-perl/lib/Etk/Tree/Model
cvs diff: Diffing proto/etk-perl/t
cvs diff: Diffing proto/etk_server
Index: proto/etk_server/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/etk_server/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- proto/etk_server/configure.in	13 Apr 2006 08:34:34 -0000	1.5
+++ proto/etk_server/configure.in	10 Jun 2006 14:52:29 -0000
@@ -53,14 +53,10 @@
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/etk_server/debian
cvs diff: Diffing proto/etk_server/doc
cvs diff: Diffing proto/etk_server/doc/img
cvs diff: Diffing proto/etk_server/examples
cvs diff: Diffing proto/etk_server/m4
cvs diff: Diffing proto/etk_server/scripts
cvs diff: Diffing proto/etk_server/src
cvs diff: Diffing proto/etk_server/src/bin
cvs diff: Diffing proto/exhibit
Index: proto/exhibit/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/exhibit/configure.in,v
retrieving revision 1.6
diff -u -r1.6 configure.in
--- proto/exhibit/configure.in	6 Apr 2006 17:18:42 -0000	1.6
+++ proto/exhibit/configure.in	10 Jun 2006 14:52:29 -0000
@@ -53,14 +53,10 @@
 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}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 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}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
cvs diff: Diffing proto/exhibit/data
cvs diff: Diffing proto/exhibit/data/images
cvs diff: Diffing proto/exhibit/debian
cvs diff: Diffing proto/exhibit/doc
cvs diff: Diffing proto/exhibit/doc/img
cvs diff: Diffing proto/exhibit/m4
cvs diff: Diffing proto/exhibit/src
cvs diff: Diffing proto/exhibit/src/bin
cvs diff: Diffing proto/exorcist
cvs diff: Diffing proto/exorcist/build
cvs diff: Diffing proto/exorcist/src
cvs diff: Diffing proto/exorcist/src/bin
cvs diff: Diffing proto/extrackt
Index: proto/extrackt/configure.in
===================================================================
RCS file: /var/cvs/e/e17/proto/extrackt/configure.in,v
retrieving revision 1.2
diff -u -r1.2 configure.in
--- proto/extrackt/configure.in	8 Apr 2006 17:07:25 -0000	1.2
+++ proto/extrackt/configure.in	10 Jun 2006 14:52:30 -0000
@@ -201,15 +201,10 @@
 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}", "")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", data)
-  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}", data)
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
cvs diff: Diffing proto/extrackt/data
cvs diff: Diffing proto/extrackt/data/etk_fe
cvs diff: Diffing proto/extrackt/data/etk_fe/images
cvs diff: Diffing proto/extrackt/data/images
cvs diff: Diffing proto/extrackt/debian
cvs diff: Diffing proto/extrackt/m4
cvs diff: Diffing proto/extrackt/src
cvs diff: Diffing proto/extrackt/src/bin
cvs diff: Diffing proto/extrackt/src/bin/etk_fe
cvs diff: Diffing proto/gfx_routines
cvs diff: Diffing proto/gfx_routines/op_blend
cvs diff: Diffing proto/gfx_routines/op_copy
cvs diff: Diffing proto/gfx_routines/op_mul