babl r274 - in trunk: . babl

[ok svn gnome org]

Author: ok
Date: Sat Jan 19 23:08:11 2008
New Revision: 274
URL: http://svn.gnome.org/viewvc/babl?rev=274&view=rev

Log:
Applied patch from Deji Akingunola <dakingun gmail com> to make babl
correctly pick up the path to the extensions on 64bit systems. Fixes
bug #510038
* babl/Makefile.am: added -DLIBDIR
* babl/babl-extension.c: use libdir and not PREFIX "/lib" when
defining the default BABL_PATH.


Modified:
   trunk/ChangeLog
   trunk/babl/Makefile.am
   trunk/babl/babl-extension.c

Modified: trunk/babl/Makefile.am
==============================================================================
--- trunk/babl/Makefile.am	(original)
+++ trunk/babl/Makefile.am	Sat Jan 19 23:08:11 2008
@@ -45,7 +45,7 @@
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
 
-AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
+AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\"
 
 lib_LTLIBRARIES= libbabl- BABL_API_VERSION@.la
 libbabl_ BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources)

Modified: trunk/babl/babl-extension.c
==============================================================================
--- trunk/babl/babl-extension.c	(original)
+++ trunk/babl/babl-extension.c	Sat Jan 19 23:08:11 2008
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#define BABL_PATH              PREFIX "/lib/" BABL_LIBRARY
+#define BABL_PATH              LIBDIR "/" BABL_LIBRARY
 
 #define BABL_INIT_HOOK         init_hook ();
 #define BABL_DESTROY_HOOK      destroy_hook ();