File libmlt-0.8.0-versioned_dirs.patch of Package libmlt

Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -128,6 +128,8 @@ build_config()
 		;;
 		esac
 		echo "LIBSUF=$LIBSUF"
+		echo "moduledir=${libdir}/mlt-${soversion}"
+		echo "mltdatadir=${datadir}/mlt-${soversion}"
 	) > config.mak
 
 	echo "#!/bin/sh" > mlt-config
@@ -155,6 +157,9 @@ build_pkgconfig()
 		echo version=$version
 		echo cflags=`grep ^framework packages.dat | cut -f 2`
 		echo libs=`grep ^framework packages.dat | cut -f 3`
+		echo moduledir=${libdir}/mlt-${soversion}
+		echo mltdatadir=${datadir}/mlt-${soversion}
+		echo meltbin=${prefix}/bin/melt${soversion}
 	) >> mlt-framework.pc
 	cat mlt-framework.pc.in >>mlt-framework.pc
 
@@ -253,6 +258,9 @@ export LIBSUF
 [ "$datadir" = "" ] && datadir=$prefix/share
 [ "$mandir" = "" ] && mandir=$prefix/share/man
 
+export moduledir=${libdir}/mlt-${soversion}
+export mltdatadir=${datadir}/mlt-${soversion}
+
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
Index: src/modules/avformat/Makefile
===================================================================
--- src/modules/avformat/Makefile.orig
+++ src/modules/avformat/Makefile
@@ -65,15 +65,15 @@ clean:
 	rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/avformat"
-	install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
-	install -m 644 consumer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/avformat"
+	install -m 644 producer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
+	install -m 644 consumer_avformat.yml "$(DESTDIR)$(mltdatadir)/avformat"
 
 uninstall:
-	rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
-	rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
-	rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
+	rm "$(DESTDIR)$(moduledir)/libmltavformat$(LIBSUF)" 2> /dev/null || true
+	rm "$(DESTDIR)$(moduledir)/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(mltdatadir)/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/Makefile
===================================================================
--- src/modules/Makefile.orig
+++ src/modules/Makefile
@@ -27,5 +27,5 @@ install:
 	done
 
 uninstall:
-	rm -rf "$(DESTDIR)$(libdir)/mlt"
+	rm -rf "$(DESTDIR)$(moduledir)"
 
Index: src/modules/core/Makefile
===================================================================
--- src/modules/core/Makefile.orig
+++ src/modules/core/Makefile
@@ -77,12 +77,12 @@ clean:
 		rm -f $(OBJS) $(ASM_OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/core"
-	install -m 644 data_fx.properties "$(DESTDIR)$(datadir)/mlt/core"
-	install -m 644 loader.dict "$(DESTDIR)$(datadir)/mlt/core"
-	install -m 644 loader.ini "$(DESTDIR)$(datadir)/mlt/core"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/core"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/core"
+	install -m 644 data_fx.properties "$(DESTDIR)$(mltdatadir)/core"
+	install -m 644 loader.dict "$(DESTDIR)$(mltdatadir)/core"
+	install -m 644 loader.ini "$(DESTDIR)$(mltdatadir)/core"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/core"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/decklink/Makefile
===================================================================
--- src/modules/decklink/Makefile.orig
+++ src/modules/decklink/Makefile
@@ -45,13 +45,13 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/decklink"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/decklink"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/decklink"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/decklink"
 
 uninstall:
-	rm "$(DESTDIR)$(libdir)/mlt/libmltdecklink$(LIBSUF)" 2> /dev/null || true
-	rm -rf "$(DESTDIR)$(datadir)/mlt/decklink"
+	rm "$(DESTDIR)$(moduledir)/libmltdecklink$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(mltdatadir)/decklink"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/dgraft/Makefile
===================================================================
--- src/modules/dgraft/Makefile.orig
+++ src/modules/dgraft/Makefile
@@ -26,7 +26,7 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/dv/Makefile
===================================================================
--- src/modules/dv/Makefile.orig
+++ src/modules/dv/Makefile
@@ -31,9 +31,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/dv"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/dv"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/dv"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/dv"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/effectv/Makefile
===================================================================
--- src/modules/effectv/Makefile.orig
+++ src/modules/effectv/Makefile
@@ -28,9 +28,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/effectv"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/effectv"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/effectv"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/effectv"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/feeds/Makefile
===================================================================
--- src/modules/feeds/Makefile.orig
+++ src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ distclean:
 clean:
 
 install:	all
-	install -d "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
-	install -d "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"
-	install -m 644 PAL/*.* "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
-	install -m 644 NTSC/*.* "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"
+	install -d "$(DESTDIR)$(mltdatadir)/feeds/PAL"
+	install -d "$(DESTDIR)$(mltdatadir)/feeds/NTSC"
+	install -m 644 PAL/*.* "$(DESTDIR)$(mltdatadir)/feeds/PAL"
+	install -m 644 NTSC/*.* "$(DESTDIR)$(mltdatadir)/feeds/NTSC"
Index: src/modules/frei0r/Makefile
===================================================================
--- src/modules/frei0r/Makefile.orig
+++ src/modules/frei0r/Makefile
@@ -34,10 +34,10 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 	install -d "$(DESTDIR)$(prefix)/share/mlt/frei0r"
-	install -m 644 blacklist.txt "$(DESTDIR)$(datadir)/mlt/frei0r"
-	install -m 644 not_thread_safe.txt "$(DESTDIR)$(datadir)/mlt/frei0r"
+	install -m 644 blacklist.txt "$(DESTDIR)$(mltdatadir)/frei0r"
+	install -m 644 not_thread_safe.txt "$(DESTDIR)$(mltdatadir)/frei0r"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/gtk2/Makefile
===================================================================
--- src/modules/gtk2/Makefile.orig
+++ src/modules/gtk2/Makefile
@@ -71,9 +71,9 @@ clean:
 		rm -f $(OBJS) $(ASM_OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/gtk2"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/gtk2"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/gtk2"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gtk2"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/jackrack/Makefile
===================================================================
--- src/modules/jackrack/Makefile.orig
+++ src/modules/jackrack/Makefile
@@ -58,14 +58,14 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/jackrack"
-	install -m 644 $(YML_FILES) "$(DESTDIR)$(datadir)/mlt/jackrack"
-	[ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(datadir)/mlt/jackrack" || true
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/jackrack"
+	install -m 644 $(YML_FILES) "$(DESTDIR)$(mltdatadir)/jackrack"
+	[ -f $(BLACKLIST) ] && install -m 644 $(BLACKLIST) "$(DESTDIR)$(mltdatadir)/jackrack" || true
 
 uninstall:
-	rm "$(DESTDIR)$(libdir)/mlt/libmltjackrack$(LIBSUF)" 2> /dev/null || true
-	rm -rf "$(DESTDIR)$(datadir)/mlt/jackrack"
+	rm "$(DESTDIR)$(moduledir)/libmltjackrack$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(mltdatadir)/jackrack"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/kdenlive/Makefile
===================================================================
--- src/modules/kdenlive/Makefile.orig
+++ src/modules/kdenlive/Makefile
@@ -32,9 +32,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/kdenlive"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/kdenlive"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/kdenlive"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/kdenlive"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/kino/Makefile
===================================================================
--- src/modules/kino/Makefile.orig
+++ src/modules/kino/Makefile
@@ -42,7 +42,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/linsys/Makefile
===================================================================
--- src/modules/linsys/Makefile.orig
+++ src/modules/linsys/Makefile
@@ -32,9 +32,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/linsys"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/linsys"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/linsys"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/linsys"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/lumas/Makefile
===================================================================
--- src/modules/lumas/Makefile.orig
+++ src/modules/lumas/Makefile
@@ -17,7 +17,7 @@ clean:
 	rm -f luma 
 
 install:	all
-	install -d $(DESTDIR)$(datadir)/mlt/lumas/PAL
-	install -d $(DESTDIR)$(datadir)/mlt/lumas/NTSC
-	install -m 644 PAL/* $(DESTDIR)$(datadir)/mlt/lumas/PAL
-	install -m 644 NTSC/* $(DESTDIR)$(datadir)/mlt/lumas/NTSC
+	install -d $(DESTDIR)$(mltdatadir)/lumas/PAL
+	install -d $(DESTDIR)$(mltdatadir)/lumas/NTSC
+	install -m 644 PAL/* $(DESTDIR)$(mltdatadir)/lumas/PAL
+	install -m 644 NTSC/* $(DESTDIR)$(mltdatadir)/lumas/NTSC
Index: src/modules/motion_est/Makefile
===================================================================
--- src/modules/motion_est/Makefile.orig
+++ src/modules/motion_est/Makefile
@@ -31,9 +31,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/motion_est"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/motion_est"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/motion_est"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/motion_est"
 
 test: $(TARGET)
 	~/mlt-devel/mlt/src/melt/melt -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
Index: src/modules/normalize/Makefile
===================================================================
--- src/modules/normalize/Makefile.orig
+++ src/modules/normalize/Makefile
@@ -27,9 +27,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/normalize"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/normalize"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/normalize"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/normalize"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/oldfilm/Makefile
===================================================================
--- src/modules/oldfilm/Makefile.orig
+++ src/modules/oldfilm/Makefile
@@ -31,10 +31,10 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d $(DESTDIR)$(datadir)/mlt/oldfilm
-	install -m 644 *.svg "$(DESTDIR)$(datadir)/mlt/oldfilm"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/oldfilm"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d $(DESTDIR)$(mltdatadir)/oldfilm
+	install -m 644 *.svg "$(DESTDIR)$(mltdatadir)/oldfilm"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/oldfilm"
 
 
 ifneq ($(wildcard .depend),)
Index: src/modules/plus/Makefile
===================================================================
--- src/modules/plus/Makefile.orig
+++ src/modules/plus/Makefile
@@ -30,9 +30,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/plus"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/plus"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/plus"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/plus"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/qimage/Makefile
===================================================================
--- src/modules/qimage/Makefile.orig
+++ src/modules/qimage/Makefile
@@ -41,9 +41,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) $(CPPOBJS)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/qimage"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/qimage"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/qimage"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/qimage"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/resample/Makefile
===================================================================
--- src/modules/resample/Makefile.orig
+++ src/modules/resample/Makefile
@@ -30,9 +30,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/resample"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/resample"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/resample"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/resample"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/rotoscoping/Makefile
===================================================================
--- src/modules/rotoscoping/Makefile.orig
+++ src/modules/rotoscoping/Makefile
@@ -30,9 +30,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d $(DESTDIR)$(datadir)/mlt/rotoscoping
-	install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(datadir)/mlt/rotoscoping"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d $(DESTDIR)$(mltdatadir)/rotoscoping
+	install -m 644 filter_rotoscoping.yml "$(DESTDIR)$(mltdatadir)/rotoscoping"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/rtaudio/Makefile
===================================================================
--- src/modules/rtaudio/Makefile.orig
+++ src/modules/rtaudio/Makefile
@@ -48,13 +48,13 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	#install -d "$(DESTDIR)$(datadir)/mlt/rtaudio"
-	#install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/rtaudio"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	#install -d "$(DESTDIR)$(mltdatadir)/rtaudio"
+	#install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/rtaudio"
 
 uninstall:
-	rm "$(DESTDIR)$(libdir)/mlt/libmltrtaudio$(LIBSUF)" 2> /dev/null || true
-	rm -rf "$(DESTDIR)$(datadir)/mlt/rtaudio"
+	rm "$(DESTDIR)$(moduledir)/libmltrtaudio$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(mltdatadir)/rtaudio"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/sdl/Makefile
===================================================================
--- src/modules/sdl/Makefile.orig
+++ src/modules/sdl/Makefile
@@ -52,9 +52,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/sdl"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/sdl"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/sdl"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/sdl"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/sox/Makefile
===================================================================
--- src/modules/sox/Makefile.orig
+++ src/modules/sox/Makefile
@@ -28,14 +28,14 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/sox"
-	install -m 644 filter_sox.yml "$(DESTDIR)$(datadir)/mlt/sox"
-	install -m 644 filter_sox_effect.yml "$(DESTDIR)$(datadir)/mlt/sox"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/sox"
+	install -m 644 filter_sox.yml "$(DESTDIR)$(mltdatadir)/sox"
+	install -m 644 filter_sox_effect.yml "$(DESTDIR)$(mltdatadir)/sox"
 
 uninstall:
-	rm "$(DESTDIR)$(libdir)/mlt/libmltsox$(LIBSUF)" 2> /dev/null || true
-	rm -rf "$(DESTDIR)$(datadir)/mlt/sox"
+	rm "$(DESTDIR)$(moduledir)/libmltsox$(LIBSUF)" 2> /dev/null || true
+	rm -rf "$(DESTDIR)$(mltdatadir)/sox"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/swfdec/Makefile
===================================================================
--- src/modules/swfdec/Makefile.orig
+++ src/modules/swfdec/Makefile
@@ -30,9 +30,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/swfdec"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/swfdec"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/swfdec"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/swfdec"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/videostab/Makefile
===================================================================
--- src/modules/videostab/Makefile.orig
+++ src/modules/videostab/Makefile
@@ -34,9 +34,9 @@ clean:
 		rm -f $(OBJS) $(TARGET)
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d $(DESTDIR)$(datadir)/mlt/videostab
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/videostab"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d $(DESTDIR)$(mltdatadir)/videostab
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/videostab"
 
 
 ifneq ($(wildcard .depend),)
Index: src/modules/vmfx/Makefile
===================================================================
--- src/modules/vmfx/Makefile.orig
+++ src/modules/vmfx/Makefile
@@ -30,9 +30,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/vmfx"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vmfx"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/vmfx"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vmfx"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/vorbis/Makefile
===================================================================
--- src/modules/vorbis/Makefile.orig
+++ src/modules/vorbis/Makefile
@@ -32,9 +32,9 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/vorbis"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/vorbis"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/vorbis"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/vorbis"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/xine/Makefile
===================================================================
--- src/modules/xine/Makefile.orig
+++ src/modules/xine/Makefile
@@ -33,7 +33,7 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/modules/xml/Makefile
===================================================================
--- src/modules/xml/Makefile.orig
+++ src/modules/xml/Makefile
@@ -31,10 +31,10 @@ clean:
 		rm -f $(OBJS) $(TARGET) 
 
 install: all
-	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-	install -d "$(DESTDIR)$(datadir)/mlt/xml"
-	install -m 644 mlt-xml.dtd "$(DESTDIR)$(datadir)/mlt/xml"
-	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/xml"
+	install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+	install -d "$(DESTDIR)$(mltdatadir)/xml"
+	install -m 644 mlt-xml.dtd "$(DESTDIR)$(mltdatadir)/xml"
+	install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/xml"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -28,15 +28,15 @@ install:
 	install -d "$(DESTDIR)$(prefix)/bin"
 	install -d "$(DESTDIR)$(prefix)/include"
 	install -d "$(DESTDIR)$(libdir)"
-	install -d "$(DESTDIR)$(libdir)/mlt"
+	install -d "$(DESTDIR)$(libdir)/mlt-${soversion}"
 	install -d "$(DESTDIR)$(libdir)/pkgconfig"
-	install -d "$(DESTDIR)$(prefix)/share/mlt"
+	install -d "$(DESTDIR)$(prefix)/share/mlt-${soversion}"
 	install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
 		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
 	done
-	cp -R presets "$(DESTDIR)$(prefix)/share/mlt"
+	cp -R presets "$(DESTDIR)$(prefix)/share/mlt-${soversion}"
 
 uninstall:
 	rm -f "$(DESTDIR)$(bindir)"/mlt-config
@@ -47,7 +47,7 @@ uninstall:
 		$(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
 	done
 	rm -rf "$(DESTDIR)$(prefix)/include/mlt"
-	rm -rf "$(DESTDIR)$(prefix)/share/mlt"
+	rm -rf "$(DESTDIR)$(prefix)/share/mlt-${soversion}"
 
 dist:
 	git archive --format=tar --prefix=mlt-$(version)/ v$(version) | gzip >mlt-$(version).tar.gz
Index: profiles/Makefile
===================================================================
--- profiles/Makefile.orig
+++ profiles/Makefile
@@ -9,10 +9,10 @@ distclean:
 clean:
 
 install:	all uninstall
-	install -d "$(DESTDIR)$(datadir)/mlt/profiles"
-	install -m 644 * "$(DESTDIR)$(datadir)/mlt/profiles"
-	rm -f "$(DESTDIR)$(datadir)/mlt/profiles/"*~
-	rm -f "$(DESTDIR)$(datadir)/mlt/profiles/Makefile"
+	install -d "$(DESTDIR)$(datadir)/mlt-${soversion}/profiles"
+	install -m 644 * "$(DESTDIR)$(datadir)/mlt-${soversion}/profiles"
+	rm -f "$(DESTDIR)$(datadir)/mlt-${soversion}/profiles/"*~
+	rm -f "$(DESTDIR)$(datadir)/mlt-${soversion}/profiles/Makefile"
 
 uninstall:
-	rm -rf "$(DESTDIR)$(datadir)/mlt/profiles"
+	rm -rf "$(DESTDIR)$(datadir)/mlt-${soversion}/profiles"
Index: src/framework/Makefile
===================================================================
--- src/framework/Makefile.orig
+++ src/framework/Makefile
@@ -79,7 +79,7 @@ OBJS += ../win32/win32.o
 SRCS += ../win32/win32.c
 endif
 
-CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" -DMLTDATADIR="\"$(datadir)\""
+CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" -DMLTDATADIR="\"$(datadir)\"" -DSOVERSION="\"$(soversion)\""
 
 LDFLAGS += $(LIBDL) -lpthread
 
@@ -114,8 +114,8 @@ install:
 	fi
 	install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
 	install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
-	install -d "$(DESTDIR)$(datadir)/mlt"
-	install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt/"
+	install -d "$(DESTDIR)$(datadir)/mlt-${soversion}"
+	install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt-${soversion}/"
 
 uninstall:
 	rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
@@ -124,7 +124,7 @@ uninstall:
 		rm -f "$(DESTDIR)$(libdir)/$(NAME)" ; \
 	fi
 	rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
-	rm -f "$(DESTDIR)$(datadir)/mlt/metaschema.yaml"
+	rm -f "$(DESTDIR)$(datadir)/mlt-${soversion}/metaschema.yaml"
 
 ifneq ($(wildcard .depend),)
 include .depend
Index: src/framework/mlt_factory.c
===================================================================
--- src/framework/mlt_factory.c.orig
+++ src/framework/mlt_factory.c
@@ -43,9 +43,9 @@
 #define PREFIX_DATA "/share/mlt"
 #else
 /** the default subdirectory of the libdir for holding modules (plugins) */
-#define PREFIX_LIB LIBDIR "/mlt"
+#define PREFIX_LIB LIBDIR "/mlt-" SOVERSION
 /** the default subdirectory of the install prefix for holding module (plugin) data */
-#define PREFIX_DATA MLTDATADIR "/mlt"
+#define PREFIX_DATA MLTDATADIR "/mlt-" SOVERSION
 #endif
 
 /** holds the full path to the modules directory - initialized and retained for the entire session */