From a162148e8a943e50f41941104b6c418ac8b95236 Mon Sep 17 00:00:00 2001
From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 4 Feb 2008 07:24:19 +0000
Subject: [PATCH] move binary modules to libdir - affects MLT_REPOSITORY added
 MLT_DATA environment variable to refer to share dir remove need for config.h

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1055 d19143bc-622f-0410-bfdd-b5b2a6649095
---
 Makefile                                | 3 ++-
 setenv                                  | 1 +
 src/framework/Makefile                  | 2 +-
 src/framework/mlt_consumer.c            | 1 -
 src/framework/mlt_factory.c             | 7 +++++--
 src/framework/mlt_filter.c              | 2 --
 src/framework/mlt_frame.c               | 1 -
 src/framework/mlt_multitrack.c          | 2 --
 src/framework/mlt_parser.c              | 1 -
 src/framework/mlt_playlist.c            | 2 --
 src/framework/mlt_producer.c            | 1 -
 src/framework/mlt_properties.c          | 1 -
 src/framework/mlt_property.c            | 2 --
 src/framework/mlt_service.c             | 1 -
 src/framework/mlt_tractor.c             | 2 --
 src/framework/mlt_transition.c          | 2 --
 src/modules/Makefile                    | 4 ++--
 src/modules/avformat/Makefile           | 2 +-
 src/modules/avformat/configure          | 2 +-
 src/modules/core/Makefile               | 4 ++--
 src/modules/core/filter_data_show.c     | 4 ++--
 src/modules/core/transition_composite.c | 2 +-
 src/modules/core/transition_luma.c      | 2 +-
 src/modules/dv/Makefile                 | 2 +-
 src/modules/effectv/Makefile            | 2 +-
 src/modules/feeds/Makefile              | 8 ++++----
 src/modules/fezzik/Makefile             | 6 +++---
 src/modules/fezzik/producer_fezzik.c    | 4 ++--
 src/modules/gtk2/Makefile               | 2 +-
 src/modules/inigo/Makefile              | 2 +-
 src/modules/jackrack/Makefile           | 2 +-
 src/modules/kdenlive/Makefile           | 2 +-
 src/modules/kino/Makefile               | 2 +-
 src/modules/lumas/Makefile              | 8 ++++----
 src/modules/motion_est/Makefile         | 2 +-
 src/modules/normalize/Makefile          | 2 +-
 src/modules/oldfilm/Makefile            | 2 +-
 src/modules/plus/Makefile               | 2 +-
 src/modules/qimage/Makefile             | 2 +-
 src/modules/resample/Makefile           | 2 +-
 src/modules/sdl/Makefile                | 2 +-
 src/modules/sox/Makefile                | 2 +-
 src/modules/sox/configure               | 2 +-
 src/modules/valerie/Makefile            | 2 +-
 src/modules/vmfx/Makefile               | 2 +-
 src/modules/vmfx/filter_shape.c         | 2 +-
 src/modules/vorbis/Makefile             | 2 +-
 src/modules/westley/Makefile            | 4 ++--
 src/modules/xine/Makefile               | 2 +-
 49 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/Makefile b/Makefile
index 5d127b43..1beb864f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,9 @@ install:
 	install -d "$(DESTDIR)$(prefix)/bin"
 	install -d "$(DESTDIR)$(prefix)/include"
 	install -d "$(DESTDIR)$(libdir)"
+	install -d "$(DESTDIR)$(libdir)/mlt"
 	install -d "$(DESTDIR)$(libdir)/pkgconfig"
-	install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -d "$(DESTDIR)$(prefix)/share/mlt"
 	install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
 	install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
 	install -m 644 packages.dat "$(DESTDIR)$(prefix)/share/mlt/"
diff --git a/setenv b/setenv
index dd381157..53b5f6ed 100644
--- a/setenv
+++ b/setenv
@@ -2,6 +2,7 @@
 # Environment variable settings to allow execution without install
 
 export MLT_REPOSITORY=`pwd`/src/modules
+export MLT_DATA=`pwd`/src/modules
 export MLT_PROFILES_PATH=`pwd`/profiles
 
 export LD_LIBRARY_PATH=\
diff --git a/src/framework/Makefile b/src/framework/Makefile
index f5df34ca..5ee621fd 100644
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -61,7 +61,7 @@ INCS = mlt_consumer.h \
 
 SRCS := $(OBJS:.o=.c)
 
-CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\""
+CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
 
 LDFLAGS += -lm $(LIBDL) -lpthread
 
diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index 04b37618..668fe2fd 100644
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt_consumer.h"
 #include "mlt_factory.h"
 #include "mlt_producer.h"
diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c
index 4a14decc..d81c0c23 100644
--- a/src/framework/mlt_factory.c
+++ b/src/framework/mlt_factory.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt.h"
 #include "mlt_repository.h"
 
@@ -26,6 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define PREFIX_LIB LIBDIR "/mlt"
+#define PREFIX_DATA PREFIX "/share/mlt"
+
 /** Singleton repositories
 */
 
@@ -68,7 +70,7 @@ int mlt_factory_init( const char *prefix )
 
 		// If no directory is specified, default to install directory
 		if ( prefix == NULL )
-			prefix = PREFIX_DATA;
+			prefix = PREFIX_LIB;
 
 		// Store the prefix for later retrieval
 		mlt_prefix = strdup( prefix );
@@ -112,6 +114,7 @@ int mlt_factory_init( const char *prefix )
 		mlt_properties_set_or_default( global_properties, "MLT_CONSUMER", getenv( "MLT_CONSUMER" ), "sdl" );
 		mlt_properties_set( global_properties, "MLT_TEST_CARD", getenv( "MLT_TEST_CARD" ) );
 		mlt_properties_set_or_default( global_properties, "MLT_PROFILE", getenv( "MLT_PROFILE" ), "dv_pal" );
+		mlt_properties_set_or_default( global_properties, "MLT_DATA", getenv( "MLT_DATA" ), PREFIX_DATA );
 	}
 
 
diff --git a/src/framework/mlt_filter.c b/src/framework/mlt_filter.c
index 8a3de98c..3d814296 100644
--- a/src/framework/mlt_filter.c
+++ b/src/framework/mlt_filter.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_filter.h"
 #include "mlt_frame.h"
 
diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 2d22c782..6424a547 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt_frame.h"
 #include "mlt_producer.h"
 #include "mlt_factory.h"
diff --git a/src/framework/mlt_multitrack.c b/src/framework/mlt_multitrack.c
index 4637d629..bf9c0738 100644
--- a/src/framework/mlt_multitrack.c
+++ b/src/framework/mlt_multitrack.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_multitrack.h"
 #include "mlt_playlist.h"
 #include "mlt_frame.h"
diff --git a/src/framework/mlt_parser.c b/src/framework/mlt_parser.c
index e56f0970..2f76e373 100644
--- a/src/framework/mlt_parser.c
+++ b/src/framework/mlt_parser.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt.h"
 #include <stdlib.h>
 
diff --git a/src/framework/mlt_playlist.c b/src/framework/mlt_playlist.c
index b5e7fb35..e2adc630 100644
--- a/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_playlist.h"
 #include "mlt_tractor.h"
 #include "mlt_multitrack.h"
diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c
index 7f95e858..df0677ce 100644
--- a/src/framework/mlt_producer.c
+++ b/src/framework/mlt_producer.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt_producer.h"
 #include "mlt_factory.h"
 #include "mlt_frame.h"
diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index bb49c857..c90c1329 100644
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt_properties.h"
 #include "mlt_property.h"
 
diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index 3feb82dd..83ceb2c5 100644
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_property.h"
 
 #include <stdio.h>
diff --git a/src/framework/mlt_service.c b/src/framework/mlt_service.c
index 49779bc0..4c978865 100644
--- a/src/framework/mlt_service.c
+++ b/src/framework/mlt_service.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "mlt_service.h"
 #include "mlt_filter.h"
 #include "mlt_frame.h"
diff --git a/src/framework/mlt_tractor.c b/src/framework/mlt_tractor.c
index 29ee362f..9ab3d8b1 100644
--- a/src/framework/mlt_tractor.c
+++ b/src/framework/mlt_tractor.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_tractor.h"
 #include "mlt_frame.h"
 #include "mlt_multitrack.h"
diff --git a/src/framework/mlt_transition.c b/src/framework/mlt_transition.c
index 047a9e94..304e3ea8 100644
--- a/src/framework/mlt_transition.c
+++ b/src/framework/mlt_transition.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
 #include "mlt_transition.h"
 #include "mlt_frame.h"
 
diff --git a/src/modules/Makefile b/src/modules/Makefile
index fe29ef42..251806a8 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -19,7 +19,7 @@ distclean:
 	done
 
 install:
-	install -m 644 producers.dat filters.dat transitions.dat consumers.dat "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 644 producers.dat filters.dat transitions.dat consumers.dat "$(DESTDIR)$(libdir)/mlt"
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
 		if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \
@@ -28,5 +28,5 @@ install:
 	done
 
 uninstall:
-	rm -rf "$(DESTDIR)$(prefix)/share/mlt/modules"
+	rm -rf "$(DESTDIR)$(libdir)/mlt"
 
diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 8d45fc6a..3d24b4ed 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -55,7 +55,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-		install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+		install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 8a72d9e7..eace4d08 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -32,7 +32,7 @@ else
 	bits=$(uname -m)
 	case $bits in
 	x86_64)
-		export LIBDIR=lib64
+		[ -d /usr/lib/lib64 ] && export LIBDIR=lib64 || export LIBDIR=lib
 		;;
 	*)
 		export LIBDIR=lib
diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 86d0b44a..b904a326 100644
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -53,8 +53,8 @@ clean:
 		rm -f $(OBJS) $(ASM_OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
-	install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/core/filter_data_show.c b/src/modules/core/filter_data_show.c
index 7c9ab3d6..8ad7fa6c 100644
--- a/src/modules/core/filter_data_show.c
+++ b/src/modules/core/filter_data_show.c
@@ -50,9 +50,9 @@ static mlt_filter obtain_filter( mlt_filter filter, char *type )
 
 		// If none is specified, pick up the default for this normalisation
 		if ( profile == NULL )
-			sprintf( temp, "%s/feeds/%s/data_fx.properties", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ) );
+			sprintf( temp, "%s/feeds/%s/data_fx.properties", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ) );
 		else if ( strchr( profile, '%' ) )
-			sprintf( temp, "%s/feeds/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( profile, '%' ) + 1 );
+			sprintf( temp, "%s/feeds/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( profile, '%' ) + 1 );
 		else
 			strcpy( temp, profile );
 
diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 4010e4f2..20f0a4f2 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -604,7 +604,7 @@ static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int w
 	{
 		// TODO: Clean up quick and dirty compressed/existence check
 		FILE *test;
-		sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+		sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
 		test = fopen( temp, "r" );
 		if ( test == NULL )
 			strcat( temp, ".png" );
diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index a553836c..55e9e3ef 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -397,7 +397,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 		if ( strchr( resource, '%' ) )
 		{
 			FILE *test;
-			sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+			sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
 			test = fopen( temp, "r" );
 			if ( test == NULL )
 				strcat( temp, ".png" );
diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 4ec79aeb..7d2868d8 100644
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -29,7 +29,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/effectv/Makefile b/src/modules/effectv/Makefile
index a3ca6bc2..19d8fdf5 100644
--- a/src/modules/effectv/Makefile
+++ b/src/modules/effectv/Makefile
@@ -28,7 +28,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index ce76aaa4..748ce477 100644
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ distclean:
 clean:
 
 install:	all
-	install -d $(DESTDIR)$(prefix)/share/mlt/modules/feeds/PAL
-	install -d $(DESTDIR)$(prefix)/share/mlt/modules/feeds/NTSC
-	install -m 644 PAL/*.* $(DESTDIR)$(prefix)/share/mlt/modules/feeds/PAL
-	install -m 644 NTSC/*.* $(DESTDIR)$(prefix)/share/mlt/modules/feeds/NTSC
+	install -d $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
+	install -d $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
+	install -m 644 PAL/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
+	install -m 644 NTSC/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
index 362e1606..78d8294e 100644
--- a/src/modules/fezzik/Makefile
+++ b/src/modules/fezzik/Makefile
@@ -27,9 +27,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
-	install -m 644 ../fezzik.dict "$(DESTDIR)$(prefix)/share/mlt/modules"
-	install -m 644 ../fezzik.ini "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 644 ../fezzik.dict "$(DESTDIR)$(prefix)/share/mlt"
+	install -m 644 ../fezzik.ini "$(DESTDIR)$(prefix)/share/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/fezzik/producer_fezzik.c b/src/modules/fezzik/producer_fezzik.c
index f5350c82..5b3eeeb3 100644
--- a/src/modules/fezzik/producer_fezzik.c
+++ b/src/modules/fezzik/producer_fezzik.c
@@ -73,7 +73,7 @@ static mlt_producer create_producer( mlt_profile profile, char *file )
 		if ( dictionary == NULL )
 		{
 			char temp[ 1024 ];
-			sprintf( temp, "%s/fezzik.dict", mlt_factory_prefix( ) );
+			sprintf( temp, "%s/fezzik.dict", mlt_environment( "MLT_DATA" ) );
 			dictionary = mlt_properties_load( temp );
 			mlt_factory_register_for_clean_up( dictionary, ( mlt_destructor )mlt_properties_close );
 		}
@@ -132,7 +132,7 @@ static void attach_normalisers( mlt_profile profile, mlt_producer producer )
 	if ( normalisers == NULL )
 	{
 		char temp[ 1024 ];
-		sprintf( temp, "%s/fezzik.ini", mlt_factory_prefix( ) );
+		sprintf( temp, "%s/fezzik.ini", mlt_environment( "MLT_DATA" ) );
 		normalisers = mlt_properties_load( temp );
 		mlt_factory_register_for_clean_up( normalisers, ( mlt_destructor )mlt_properties_close );
 	}
diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index d2011ac0..7990bc92 100644
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -53,7 +53,7 @@ clean:
 		rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile
index 23185598..da1434e2 100644
--- a/src/modules/inigo/Makefile
+++ b/src/modules/inigo/Makefile
@@ -26,7 +26,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 7c821b3f..a8754f7a 100644
--- a/src/modules/jackrack/Makefile
+++ b/src/modules/jackrack/Makefile
@@ -40,7 +40,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile
index 91bdd33e..e2cc49bb 100644
--- a/src/modules/kdenlive/Makefile
+++ b/src/modules/kdenlive/Makefile
@@ -30,7 +30,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 4905fd7a..46326c75 100644
--- a/src/modules/kino/Makefile
+++ b/src/modules/kino/Makefile
@@ -38,7 +38,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index caec1869..14079e09 100644
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -17,7 +17,7 @@ clean:
 	rm -f luma 
 
 install:	all
-	install -d $(DESTDIR)$(prefix)/share/mlt/modules/lumas/PAL
-	install -d $(DESTDIR)$(prefix)/share/mlt/modules/lumas/NTSC
-	install -m 644 PAL/* $(DESTDIR)$(prefix)/share/mlt/modules/lumas/PAL
-	install -m 644 NTSC/* $(DESTDIR)$(prefix)/share/mlt/modules/lumas/NTSC
+	install -d $(DESTDIR)$(prefix)/share/mlt/lumas/PAL
+	install -d $(DESTDIR)$(prefix)/share/mlt/lumas/NTSC
+	install -m 644 PAL/* $(DESTDIR)$(prefix)/share/mlt/lumas/PAL
+	install -m 644 NTSC/* $(DESTDIR)$(prefix)/share/mlt/lumas/NTSC
diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index 83048d93..6fff507f 100644
--- a/src/modules/motion_est/Makefile
+++ b/src/modules/motion_est/Makefile
@@ -31,7 +31,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 test: $(TARGET)
 	~/mlt-devel/mlt/src/inigo/inigo -filter motion_est -filter vismv -filter benchmark -consumer sdl rescale=none real_time=0 audio_off=1 silent=1 /media/cdrecorder/BBC.The.Private.Life.Of.Plants.Pt5.Living.Together.DivX505.AC3.www.MVGroup.org.uk.avi in=50000
diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index eaec6eca..923c2238 100644
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -26,7 +26,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
index a4e49bb2..353ba6fd 100644
--- a/src/modules/oldfilm/Makefile
+++ b/src/modules/oldfilm/Makefile
@@ -31,7 +31,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index b2bc473f..29eac4d0 100644
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -30,7 +30,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index 8c23b6ec..dfd3993d 100644
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -30,7 +30,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index c4cc9cb7..b9d9fa55 100644
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -28,7 +28,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index ccc94126..a18191e8 100644
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -45,7 +45,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 0de5c29d..a02e0ec5 100644
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -27,7 +27,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/sox/configure b/src/modules/sox/configure
index 16197741..e306c0b9 100755
--- a/src/modules/sox/configure
+++ b/src/modules/sox/configure
@@ -31,7 +31,7 @@ then
 			# chop bin
 			soxdir=$(dirname $soxdir)
 			echo "CFLAGS += -DSOX14 -I$soxdir/include" > config.mak
-			echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox" >> config.mak
+			echo "LDFLAGS += -L$soxdir/$LIBDIR -lsox -lsfx" >> config.mak
 		fi
 	fi
 
diff --git a/src/modules/valerie/Makefile b/src/modules/valerie/Makefile
index 2e3c4398..b4b85d3d 100644
--- a/src/modules/valerie/Makefile
+++ b/src/modules/valerie/Makefile
@@ -26,7 +26,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index 0ee264fd..f60d2335 100644
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -30,7 +30,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/vmfx/filter_shape.c b/src/modules/vmfx/filter_shape.c
index fad32f4b..fdd33e43 100644
--- a/src/modules/vmfx/filter_shape.c
+++ b/src/modules/vmfx/filter_shape.c
@@ -145,7 +145,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 		if ( strchr( resource, '%' ) )
 		{
 			FILE *test;
-			sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+			sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
 			test = fopen( temp, "r" );
 
 			if ( test == NULL )
diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index 57faeadc..51557e5c 100644
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -28,7 +28,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile
index 37c490b4..dda026e4 100644
--- a/src/modules/westley/Makefile
+++ b/src/modules/westley/Makefile
@@ -29,8 +29,8 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
-	install -m 644 westley.dtd "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 644 westley.dtd "$(DESTDIR)$(prefix)/share/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index 82494332..d173983c 100644
--- a/src/modules/xine/Makefile
+++ b/src/modules/xine/Makefile
@@ -28,7 +28,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 
 ifneq ($(wildcard .depend),)
 include .depend
-- 
2.39.2