gegl r1853 - in trunk: . gegl

[ok svn gnome org]

Author: ok
Date: Fri Jan 18 10:19:34 2008
New Revision: 1853
URL: http://svn.gnome.org/viewvc/gegl?rev=1853&view=rev

Log:
* gegl/Makefile.am:
* gegl/gegl-init.c: made GEGL_PATH depend on libdir and not prefix,
makes GEGL find it's ops also on 64bit systems.


Modified:
   trunk/ChangeLog
   trunk/gegl/Makefile.am
   trunk/gegl/gegl-init.c

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Fri Jan 18 10:19:34 2008
@@ -48,7 +48,7 @@
 	-I$(top_srcdir)/gegl/buffer	\
 	@DEP_CFLAGS@ @BABL_CFLAGS@
 
-AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
+AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\"
 
 libgegl_ GEGL_API_VERSION@includedir = $(includedir)/gegl-$(GEGL_API_VERSION)
 

Modified: trunk/gegl/gegl-init.c
==============================================================================
--- trunk/gegl/gegl-init.c	(original)
+++ trunk/gegl/gegl-init.c	Fri Jan 18 10:19:34 2008
@@ -222,7 +222,7 @@
       gchar *module_path;
 
       if (g_getenv ("BABL_ERROR") == NULL)
-        g_setenv ("BABL_ERROR", "0.007", 0);
+          g_setenv ("BABL_ERROR", "0.0001", 0);
 
       if (g_getenv ("GEGL_PATH"))
         {
@@ -233,7 +233,7 @@
 #ifdef G_OS_WIN32
           module_path = g_win32_get_package_installation_subdirectory (PACKAGE_NAME, "lib" GEGL_LIBRARY ".dll", GEGL_LIBRARY);
 #else
-          module_path = g_strdup (PREFIX "/lib/" GEGL_LIBRARY);
+          module_path = g_strdup (LIBDIR "/" GEGL_LIBRARY);
 #endif
         }