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

diff --git a/Makefile b/Makefile
index 5d127b438f6371ac805eb34d43f7e3097eb9457d..1beb864fcecf0568e6221c42e7e3b8af99377733 100644 (file)
--- 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 dd38115741f14edaccf61466ad54b37be4ddb45f..53b5f6ed2cff49d40b0c0644c9442cc9a5a9dc87 100644 (file)
--- 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 f5df34ca29a106836ccb280db44c1dd5a20f8227..5ee621fdecd85be2df726b62b3026b3de7c5a88d 100644 (file)
--- 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 04b37618b023175956f9351db1c1be7300123749..668fe2fd469b26ae846d5dda71978606b5efae69 100644 (file)
--- 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 4a14decc98ef02ed28e9335b81a629522d68ca7a..d81c0c231d864651cc3a550332dbe7325b5a4a83 100644 (file)
--- 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 8a3de98c2cf3d083f8632aa3da9e2eae062251ed..3d814296ff70bf359dc0de8bb1df59e02b708b84 100644 (file)
--- 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 2d22c782b24b7cc4131863866d29688dde27800e..6424a5477eaa56eecd4f1c9eb998f88fd4580fce 100644 (file)
--- 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 4637d62923561980685f044b0e43208b33b9d77f..bf9c073835e5c1c9aa63589ad74d56dc4f2eb6dd 100644 (file)
--- 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 e56f097040560b29c945599db34cbaac13398dc5..2f76e3733dcfadf4738d1108d68cbdaa9b8d3352 100644 (file)
--- 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 b5e7fb35c9e85cf813a54496cf764ae8add19522..e2adc630c024717b028cf090762c3f465d314f41 100644 (file)
--- 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 7f95e8584bc3be9113f030a169534e1fa71f55aa..df0677ce2753cce5733c5d2bc4dfe3877574c46f 100644 (file)
--- 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 bb49c857b42c91804051996ff0e3de2c8bd44499..c90c13294433b2e13f085e580365fc1b902747ef 100644 (file)
--- 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 3feb82ddbf5a86857793fc6e2e7eb90c1a0a5daa..83ceb2c58e47badb0eab05b6432f8748e4554f36 100644 (file)
--- 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 49779bc01523222d6e9b921b3dd3192e3fd9a5a1..4c978865a5f84fa5e9296dcf498b4876f4a63630 100644 (file)
--- 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 29ee362fdcceec7164d0ba22c2fa52314cc7c95d..9ab3d8b12cef855d566f7919c4f78133d6691e3e 100644 (file)
--- 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 047a9e94fb921a6b0ac08cd938a57984e322486d..304e3ea89f1e4cd73432e371ed0eb4b7a43d0d79 100644 (file)
--- 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 fe29ef420bf2c9b253eb77e72aa99fa0fa93cac9..251806a8b0018183cc5fa67ef269109de7352b2b 100644 (file)
--- 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 8d45fc6a2071d093053b1350cf83f833d45c5b18..3d24b4edfa4cfd9f263daf700e2690b1725cba73 100644 (file)
--- 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 8a72d9e7a2f75867001b46b31188ee097a5c5af4..eace4d08d2d2bdcb367d18222b489df924a1b720 100755 (executable)
--- 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 86d0b44ab398829620830617c408fabb3d2ba600..b904a326f0f71770bd64f3fe1831c1d9b6e988fc 100644 (file)
--- 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 7c9ab3d606c0dbd9da87e364a81be7007b0a56ee..8ad7fa6c6ea64e33c641891b8d3c3d4ad7e24d82 100644 (file)
--- 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 4010e4f270ccbcc03d012754f30e4cdfea419cb5..20f0a4f2a0091c1fdd1a4f21674b9640e4f187c8 100644 (file)
--- 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 a553836c14216bda80e8825f471663e39b1aa1e7..55e9e3efe72a5e8198dbcd7442a2a527d24064b7 100644 (file)
--- 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 4ec79aeb010bdbac2a87717fcd8dffe08fcd5f08..7d2868d8d531c1a4c23e4a07497a5de7f6601a79 100644 (file)
--- 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 a3ca6bc2f830359867c1adf73fddc5b06bb31405..19d8fdf556c853260ab179ced257d033c4a367d5 100644 (file)
--- 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 ce76aaa48eb98733b606d4795a11525caa14021e..748ce4770d929c29007d3009f5a90fa61a8e366d 100644 (file)
--- 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 362e160691e0da376e37fe604b71f079a75caade..78d8294e138df8f47d84a564e164c5dede97a270 100644 (file)
--- 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 f5350c82aac18339d9b6df9ad5c6768fd1ce1137..5b3eeeb3f84bf3376a1ddf6f91820b6d6c9208c6 100644 (file)
--- 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 d2011ac0caa8aa43e7c7ea991b7344e45b73013b..7990bc9201ad11ce7451269a5827466ce779087e 100644 (file)
--- 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 2318559805761c5fb2973ceb408ca7da037b351d..da1434e2b97885cde3854892b8440796143a7fb3 100644 (file)
--- 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 7c821b3f22c7570e5735e62fb641e6b9a7842fa3..a8754f7a5a216fa0b0c6d7687874063f0830789b 100644 (file)
--- 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 91bdd33ef4d73f830f39c98211dcc80e6f54a7a0..e2cc49bbdc33a3533c1d108f9369e5b4d771cb24 100644 (file)
--- 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 4905fd7a2641b3140bbeffa138db3ca8b551f4d0..46326c759a15821ec36a1b7d9097eecad6ff0254 100644 (file)
--- 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 caec1869ebdd455ffe008c3d9bd6dc080fd7f314..14079e0914fe6b968ec044be69581426767455fc 100644 (file)
--- 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 83048d93d6ec2e6e90bffe391dbd96061d815394..6fff507f25c559a570d609e013f5ceedc43a0179 100644 (file)
--- 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 eaec6eca11c52f34da21cec9d6343c2ee9c9a3f7..923c2238a7e5661d668dbe93dc6b2776cd9af898 100644 (file)
--- 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 a4e49bb2d9d632e45312b2ffef5680f18a88dba4..353ba6fde33adbd642c0311290cc236c5156ef6f 100644 (file)
--- 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 b2bc473f1e444061c01e8991109b867da0bc7951..29eac4d037453542924698831281a09d8c0ebefc 100644 (file)
--- 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 8c23b6ec5a657446d0a60112952038a4f971063a..dfd3993d4b4a3d23fd812395a55c45d127f9eacf 100644 (file)
--- 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 c4cc9cb771b4d52bb2a3ad273236993f1d55bc83..b9d9fa551f5821b892b46a23a3b02346e7c53e97 100644 (file)
--- 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 ccc94126907e7eac90a6ed0cd55dc95c3942ec90..a18191e83d2fe801a2a2815aa5ebdb9fcd862b56 100644 (file)
--- 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 0de5c29dd97a412799559df309f9a3965a592d69..a02e0ec5f59be75194f65b6e730b0adfd224210c 100644 (file)
--- 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 16197741d2eab2856af66b2d56837d00266b3920..e306c0b99b6167af294bb96dd45f55c1a89b94b5 100755 (executable)
--- 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 2e3c43982362167e9549471bef865bd264be1568..b4b85d3da7e66cb70677fd7fd2e7643dcf1584b2 100644 (file)
--- 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 0ee264fd54dcd5b8b1807dd1bb3c3e84cb9fbf68..f60d23350aa455b59041b172061d4a3a81090a33 100644 (file)
--- 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 fad32f4bdfdcb0c0fa2c2dcfc50a768b2f5f4257..fdd33e435233bb34eaf30077ca83fe187d903473 100644 (file)
--- 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 57faeadc59e2170f3956f2ea953fbde92bb6f858..51557e5c6cde1c936e2110c10b00cd3b5b9b9a76 100644 (file)
--- 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 37c490b4bbdc59afbd84d88d36cfcb408f7f095f..dda026e47e09a8fd894314929bec9c9cdf29dcb0 100644 (file)
--- 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 82494332bb2f3b99fae9371c91eecdf0913117a2..d173983c99fc2d31f68c73b697fb4ff40c7aa993 100644 (file)
--- 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