Sophie

Sophie

distrib > Mandriva > 2008.1 > i586 > by-pkgid > 84c2e05e3d8b3254f8ac91fdd6fccf5f > files > 3

openlibraries-0.5.0-0.20080328.1mdv2008.1.src.rpm

diff -p -up openlibraries-0.5.0/Makefile.am.libpath openlibraries-0.5.0/Makefile.am
--- openlibraries-0.5.0/Makefile.am.libpath	2007-10-28 12:24:51.000000000 +0100
+++ openlibraries-0.5.0/Makefile.am	2008-04-03 12:01:14.000000000 +0200
@@ -16,7 +16,7 @@ SUBDIRS = 	\
 	effects	\
 	test
 
-openlibraries_configdir = $(libdir)/openlibraries-$(OL_MAJOR).$(OL_MINOR).$(OL_SUB)/include
+openlibraries_configdir = $(includedir)/openlibraries-$(OL_MAJOR).$(OL_MINOR).$(OL_SUB)/
 openlibraries_config_DATA = openlibraries_global_config.hpp
 
 pkgconfigdir = $(libdir)/pkgconfig
diff -p -up openlibraries-0.5.0/configure.ac.libpath openlibraries-0.5.0/configure.ac
--- openlibraries-0.5.0/configure.ac.libpath	2008-01-25 09:35:14.000000000 +0100
+++ openlibraries-0.5.0/configure.ac	2008-04-03 12:09:04.000000000 +0200
@@ -318,18 +318,19 @@ dnl include, lib and plugin path
 OPENLIBRARIES_INCLUDEPATH="$includedir/openlibraries-$OL_MAJOR.$OL_MINOR.$OL_SUB"
 OPENLIBRARIES_LIBPATH="$libdir/openlibraries-$OL_MAJOR.$OL_MINOR.$OL_SUB"
 OPENLIBRARIES_DATAPATH="$datadir/openlibraries-$OL_MAJOR.$OL_MINOR.$OL_SUB"
-OPENIMAGELIB_LIBPATH="${OPENLIBRARIES_LIBPATH}/openimagelib/$OL_LIBNAME"
+OPENIMAGELIB_LIBPATH="$libdir"
 OPENIMAGELIB_PLUGINPATH="${OPENLIBRARIES_LIBPATH}/openimagelib/plugins"
-OPENMEDIALIB_LIBPATH="${OPENLIBRARIES_LIBPATH}/openmedialib/$OL_LIBNAME"
+OPENMEDIALIB_LIBPATH="$libdir"
 OPENMEDIALIB_PLUGINPATH="${OPENLIBRARIES_LIBPATH}/openmedialib/plugins"
 OPENEFFECTSLIB_PLUGINPATH="${OPENLIBRARIES_LIBPATH}/openeffectslib/plugins"
-OPENOBJECTLIB_LIBPATH="${OPENLIBRARIES_LIBPATH}/openobjectlib/$OL_LIBNAME"
+OPENOBJECTLIB_LIBPATH="$libdir"
 OPENOBJECTLIB_PLUGINPATH="${OPENLIBRARIES_LIBPATH}/openobjectlib/plugins"
-OPENOBJECTLIB_MEDIAPATH="$datadir/openlibraries-$OL_MAJOR.$OL_MINOR/media"
+OPENOBJECTLIB_MEDIAPATH="$datadir/openlibraries-$OL_MAJOR.$OL_MINOR.$OL_SUB/media"
 OPENOBJECTLIB_SHADERSPATH="${OPENLIBRARIES_DATAPATH}/shaders"
-OPENASSETLIB_LIBPATH="${OPENLIBRARIES_LIBPATH}/openassetlib/$OL_LIBNAME"
+OPENASSETLIB_LIBPATH="$libdir"
 OPENASSETLIB_PLUGINPATH="${OPENLIBRARIES_LIBPATH}/openassetlib/plugins"
-OPENPLUGINLIB_LIBPATH="${OPENLIBRARIES_LIBPATH}/openpluginlib/$OL_LIBNAME"
+OPENPLUGINLIB_LIBPATH="$libdir"
+OPENEFFECTSLIB_LIBPATH="$libdir"
 OPENEFFECTSLIB_SHADERSPATH="${OPENLIBRARIES_DATAPATH}/shaders"
 AC_SUBST(OPENIMAGELIB_LIBPATH)
 AC_SUBST(OPENIMAGELIB_PLUGINPATH)