From 37642982f7223a235fe7d279a241c37268067e6f Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 13 Jul 2006 19:48:09 +0000
Subject: [PATCH] make other core efl things do the same package thing

SVN revision: 23876
---
 legacy/ecore/src/bin/Makefile.am              |  5 ++-
 legacy/ecore/src/lib/ecore_config/Makefile.am |  5 ++-
 legacy/eet/configure.in                       | 35 ++++++++----------
 legacy/evas/configure.in                      | 36 ++++++++-----------
 legacy/evas/src/bin/Makefile.am               |  5 ++-
 legacy/evas/src/lib/file/Makefile.am          |  5 ++-
 6 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/legacy/ecore/src/bin/Makefile.am b/legacy/ecore/src/bin/Makefile.am
index ceae9ac318..136d7c4c2d 100644
--- a/legacy/ecore/src/bin/Makefile.am
+++ b/legacy/ecore/src/bin/Makefile.am
@@ -77,7 +77,10 @@ INCLUDES = \
 -I$(top_builddir)/src/lib/ecore_config \
 @EVAS_CFLAGS@ \
 @x_cflags@ \
-@EET_CFLAGS@
+@EET_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
 
 bin_PROGRAMS = \
 ecore_test \
diff --git a/legacy/ecore/src/lib/ecore_config/Makefile.am b/legacy/ecore/src/lib/ecore_config/Makefile.am
index c85b49b064..83061f25ac 100644
--- a/legacy/ecore/src/lib/ecore_config/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_config/Makefile.am
@@ -7,7 +7,10 @@ INCLUDES = \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_ipc \
 -I$(top_builddir)/ \
-@EVAS_CFLAGS@ @EET_CFLAGS@
+@EVAS_CFLAGS@ @EET_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
 
 CLEANFILES = $(DB)
 
diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index 7e1da635b9..edab7e2d18 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -86,40 +86,35 @@ Solaris 10)])
 ], AC_MSG_WARN([Cannot check when cross-compiling -- assuming C99 '%a' support is OK])
 )
 
-dnl Set PACKAGE_DATA_DIR in config.h.
-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
-
-dnl Set PACKAGE_BIN_DIR in config.h.
 if test "x${bindir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${prefix}/bin"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables])
+  PACKAGE_BIN_DIR="${bindir}"
 fi
+AC_SUBST(PACKAGE_BIN_DIR)
 
-dnl Set PACKAGE_LIB_DIR in config.h.
 if test "x${libdir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries] )
+    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries])
+    PACKAGE_LIB_DIR="${prefix}/lib"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
+  PACKAGE_LIB_DIR="${libdir}"
 fi
+AC_SUBST(PACKAGE_LIB_DIR)
+		
+if test "x${prefix}" = "xNONE"; then
+  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+else
+  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+fi
+AC_SUBST(PACKAGE_DATA_DIR)
 
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
-
-#dnl Documentation
 #AM_CHECK_DOXYGEN()
 
 AC_OUTPUT([
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index a55d5458cc..448da3b2cc 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -21,40 +21,34 @@ MODULE_ARCH="$host_os-$host_cpu"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
-dnl Add the languages which your application supports here.
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-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
-
-dnl Set PACKAGE_BIN_DIR in config.h.
 if test "x${bindir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation Directory for User Executables])
+    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation Directory for User Executables])
+    PACKAGE_BIN_DIR="${prefix}/bin"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory for User Executables])
+  PACKAGE_BIN_DIR="${bindir}"
 fi
+AC_SUBST(PACKAGE_BIN_DIR)
 
-dnl Set PACKAGE_LIB_DIR in config.h.
 if test "x${libdir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation Directory for Libraries])
+    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation Directory for Libraries])
+    PACKAGE_LIB_DIR="${prefix}/lib"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory for Libraries])
+  PACKAGE_LIB_DIR="${libdir}"
 fi
-
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code Directory])
+AC_SUBST(PACKAGE_LIB_DIR)
+		
+if test "x${prefix}" = "xNONE"; then
+  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+else
+  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+fi
+AC_SUBST(PACKAGE_DATA_DIR)
 
 x_dir=""
 x_cflags=""
diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am
index 5312446751..61b0756d86 100644
--- a/legacy/evas/src/bin/Makefile.am
+++ b/legacy/evas/src/bin/Makefile.am
@@ -13,7 +13,10 @@ INCLUDES = \
 -I$(top_srcdir)/src/modules/engines/software_x11 \
 -I$(top_srcdir)/src/modules/engines/software_xcb \
 -I$(top_srcdir)/src/modules/engines/xrender_x11 \
--I$(top_srcdir)/src/modules/engines/xrender_xcb
+-I$(top_srcdir)/src/modules/engines/xrender_xcb \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
 
 bin_PROGRAMS = \
 @ENGINE_SOFTWARE_X11_PRG@ \
diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am
index 6c7ed63369..2da1cf8b76 100644
--- a/legacy/evas/src/lib/file/Makefile.am
+++ b/legacy/evas/src/lib/file/Makefile.am
@@ -8,7 +8,10 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES	     = -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       @FREETYPE_CFLAGS@
+		       @FREETYPE_CFLAGS@ \
+		       -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+		       -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+		       -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
 
 noinst_LTLIBRARIES      = libevas_file.la
 libevas_file_la_SOURCES  = \