+ DESTDIR patch from Anthony Green (green at redhat dot com) - many thanks :-)

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@862 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/Makefile b/Makefile
index cf1e7a1ecee4f7de9f209c25682adeaf66764f1d..2a062c8f1ce4ee00ae39cb0d3abfa0e51fc65cb2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,16 +24,18 @@ dist-clean:
        rm config.mak;
 
 install:
-       install -d "$(prefix)/bin"
-       install -d "$(prefix)/include"
-       install -d "$(prefix)/lib"
-       install -d "$(prefix)/lib/pkgconfig"
-       install -d "$(prefix)/share/mlt/modules"
-       install -c -m 755 mlt-config "$(bindir)"
-       install -c -m 644 *.pc "$(prefix)/lib/pkgconfig"
-       install -m 644 packages.dat "$(prefix)/share/mlt/"
+       install -d "$(DESTDIR)$(prefix)/bin"
+       install -d "$(DESTDIR)$(prefix)/include"
+       install -d "$(DESTDIR)$(prefix)/lib"
+       install -d "$(DESTDIR)$(prefix)/lib/pkgconfig"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
+       install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
+       install -c -m 644 *.pc "$(DESTDIR)$(prefix)/lib/pkgconfig"
+       install -m 644 packages.dat "$(DESTDIR)$(prefix)/share/mlt/"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
-               $(MAKE) -C $$subdir $@ || exit 1; \
+               $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
        done; \
-       /sbin/ldconfig || true
+       if test -z "$(DESTDIR)"; then \
+         /sbin/ldconfig || true; \
+       fi

diff --git a/src/albino/Makefile b/src/albino/Makefile
index 7b567788e68980e3d861d11898c043fc17e5cf46..e527ef1da7a551840fdf9710011464bd8f3de9dd 100644 (file)
--- a/src/albino/Makefile
+++ b/src/albino/Makefile
@@ -25,8 +25,8 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:       all
-       install -d "$(bindir)"
-       install -c -s -m 755 $(TARGET) "$(bindir)"
+       install -d "$(DESTDIR)$(bindir)"
+       install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 15479e0db4d4cd8540b935ecee6f26b9dede27d5..4827df18ca860dc18b21dbf3b2eea0d0fb9ac68a 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -67,9 +67,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:
-       install -m 755 $(TARGET) $(prefix)/lib/libmlt$(LIBSUF)
-       install -d "$(prefix)/include/mlt/framework"
-       install -m 644 $(INCS) "$(prefix)/include/mlt/framework"
+       install -m 755 $(TARGET) $(DESTDIR)$(prefix)/lib/libmlt$(LIBSUF)
+       install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
+       install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/humperdink/Makefile b/src/humperdink/Makefile
index 2f0d4dac03aa34008283fbf2e9e26895b9f4ebe0..c27adaea4ab3bb266f23dee0a16f0062262b158a 100644 (file)
--- a/src/humperdink/Makefile
+++ b/src/humperdink/Makefile
@@ -27,8 +27,8 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:       all
-       install -d "$(bindir)"
-       install -c -s -m 755 $(TARGET) "$(bindir)"
+       install -d "$(DESTDIR)$(bindir)"
+       install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/inigo/Makefile b/src/inigo/Makefile
index 57e750e359cca0e3645f6664c59f260c2bf1e522..02439ca5ff487f1401242d58545c9698dc300e04 100644 (file)
--- a/src/inigo/Makefile
+++ b/src/inigo/Makefile
@@ -26,8 +26,8 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:       all
-       install -d "$(bindir)"
-       install -c -s -m 755 $(TARGET) "$(bindir)"
+       install -d "$(DESTDIR)$(bindir)"
+       install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/miracle/Makefile b/src/miracle/Makefile
index efb5f00852bd4adfb542116bba966c84c9bfdc6b..b3ee7758286c3ade793150d6ed69a74c87444bf9 100644 (file)
--- a/src/miracle/Makefile
+++ b/src/miracle/Makefile
@@ -42,11 +42,11 @@ clean:
                        rm -f $(OBJS) $(TARGET) libmiracle$(LIBSUF)
 
 install:       all
-       install -d "$(bindir)"
-       install -c -s -m 755 $(TARGET) "$(bindir)"
-       install -m 755 libmiracle$(LIBSUF) $(prefix)/lib/libmiracle$(LIBSUF)
-       mkdir -p "$(prefix)/include/mlt/miracle"
-       install -m 644 $(INCS) "$(prefix)/include/mlt/miracle"
+       install -d "$(DESTDIR)$(bindir)"
+       install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
+       install -m 755 libmiracle$(LIBSUF) $(DESTDIR)$(prefix)/lib/libmiracle$(LIBSUF)
+       mkdir -p "$(DESTDIR)$(prefix)/include/mlt/miracle"
+       install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/miracle"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/Makefile b/src/modules/Makefile
index c6a8fd1a748251aae44a239dfdc468be3e3e7b0d..e93ade0242f7889da363c0f8bad7c6503d7a7aa9 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -20,11 +20,11 @@ dist-clean:
        done
 
 install:
-       install -m 644 producers.dat filters.dat transitions.dat consumers.dat "$(prefix)/share/mlt/modules"
+       install -m 644 producers.dat filters.dat transitions.dat consumers.dat "$(DESTDIR)$(prefix)/share/mlt/modules"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \
-               then $(MAKE) -C $$subdir $@ || exit 1; \
+               then $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
                fi \
        done
 

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index ce4259c9eed70638ec21214644287fe2b5d909b9..3dc1a36990139d0723cf48a8d4d0b94821f86e01 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -45,11 +45,11 @@ clean:
                rm -f ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) $(OBJS) $(TARGET) 
 
 install: all
-               install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+               install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
                if [ $(LOCAL_FFMPEG) ] ; then \
-                       install -m 755 ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) "$(prefix)/lib" ; \
-                       install -m 755 ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) "$(prefix)/lib" ; \
-                       install -m 755 ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) "$(prefix)/lib" ; \
+                       install -m 755 ../../framework/libavcodec$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(prefix)/lib" ; \
+                       install -m 755 ../../framework/libavformat$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(prefix)/lib" ; \
+                       install -m 755 ../../framework/libavutil$(AVFORMAT_SUFFIX)$(LIBSUF) "$(DESTDIR)$(prefix)/lib" ; \
                fi
 
 ifneq ($(wildcard .depend),)

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 1e4cab1f4e8518ab06ede971a11478ca48248f8a..0c1b49afe095bbc55d643d7cbd30b48a237bb8f3 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -52,8 +52,8 @@ clean:
                rm -f $(OBJS) $(ASM_OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
-       install -m 644 ../data_fx.properties "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+       install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index ace8f33f959ba296920a2bec40c4f24f7d1228e4..39abd766ac2dd7310972a5d148be8974c722c299 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index 92d6a119f03e6571c3ae77034fb6f6ca7e9bd3bb..c557a6ae71aaf9a63e80e0e805cffa1137e34afd 100644 (file)
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ dist-clean:
 clean:
 
 install:       all
-       install -d $(prefix)/share/mlt/modules/feeds/PAL
-       install -d $(prefix)/share/mlt/modules/feeds/NTSC
-       install -m 644 PAL/*.* $(prefix)/share/mlt/modules/feeds/PAL
-       install -m 644 NTSC/*.* $(prefix)/share/mlt/modules/feeds/NTSC
+       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

diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
index c64c0f2b16e3aa58a18e0152a688fc6ae9fc235a..6102e36e96d8caa6bf453e5b634e96cdad6dfa67 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) "$(prefix)/share/mlt/modules"
-       install -m 644 ../fezzik.dict "$(prefix)/share/mlt/modules"
-       install -m 644 ../fezzik.ini "$(prefix)/share/mlt/modules"
+       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"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 90193330671578505c1a3ef62482c6c54467051d..87465def1452ca69b38f5a2449bcc5e0c3a1ae1e 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile
index c313d374980a42e80fd2a320fc41c604080e05e9..1c56f4b7ea9aee87dea3f5cc2c45285e1239f9af 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile
index 70efa83c26ea40c1becd8319f00fb6bdcf9b9c06..294643ae9954589f4e1510e1ed238dfeac3696d9 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/kino/Makefile b/src/modules/kino/Makefile
index 95bd66de15da4a38fbacf976db287a4632273396..cfbb6a051e34da2bf5b83c94ff88619a581744ee 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index fe436bdcddc2c8587c4da404bf66686faec2bb6e..8d663ef86c1e38669a95b45131695f545d5a6d82 100644 (file)
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -17,7 +17,7 @@ clean:
        rm -f luma 
 
 install:       all
-       install -d $(prefix)/share/mlt/modules/lumas/PAL
-       install -d $(prefix)/share/mlt/modules/lumas/NTSC
-       install -m 644 PAL/* $(prefix)/share/mlt/modules/lumas/PAL
-       install -m 644 NTSC/* $(prefix)/share/mlt/modules/lumas/NTSC
+       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

diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
index 16bf517415a0a1e6c114b7cb22d6970fe46c1502..bd0c57a4bd4202593bd3ffa14e9ec3aef59fd937 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 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 1237c7bdb27d245b410301dda99eafaff857cfca..42e11138be9858da8a71f6e1e73bccd3f6c410b2 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index 645fbaa89e74e0ebfb8dfb451b8988e774c55605..2577d6630330906e28b2264e70890f3f041d1be2 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index 7250641b794f1f1579d6cd697d6817af40648617..14d94cd3f12f59166c41b5024310d2f100fa5ec6 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 929c03f493a1718d8644a8d04c49551b6091841c..6058a15e93a6ae75d5d346a3df21676f616a9e27 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -43,7 +43,7 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index e80928c9fc9aec23b7f9dc33ccb45d2ff92bc02b..33e9865211a0746d8146a8e30f72dbb25665d84e 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -26,7 +26,7 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/valerie/Makefile b/src/modules/valerie/Makefile
index d23e6f002b498f7e5fddcb05417c1a7c706de3a1..b450cb3142c3d6283f64edca2433a891d27d8f7c 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
index 13f59ad82a52d372f5af2b161e40620ef5944eea..75bb76dffcf0201feaa49b0cbfc8919584e04352 100644 (file)
--- a/src/modules/vmfx/Makefile
+++ b/src/modules/vmfx/Makefile
@@ -29,7 +29,7 @@ clean:
                rm -f $(OBJS) $(TARGET) 
 
 install: all
-       install -m 755 $(TARGET) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index a367618fa9a794b04ea16f9a394e3abea6a1f0d4..6720b313aa152c75d9f5c8a9e5ffdd2f0744d971 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile
index 5f8fc34de86fa969531cee886a0ca15e45d8f3bd..9ba06bc00448808540b22892eb57b3d79b58d574 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) "$(prefix)/share/mlt/modules"
-       install -m 644 westley.dtd "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
+       install -m 644 westley.dtd "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
index 00ee8466998d9ff9b070a5b1ac3eb6776f7e715f..08978c8570b8e5f51e9025da1f56bda5e58a882f 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) "$(prefix)/share/mlt/modules"
+       install -m 755 $(TARGET) "$(DESTDIR)$(prefix)/share/mlt/modules"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/valerie/Makefile b/src/valerie/Makefile
index d8b09fb7cfab3ffa4ba2c585b50a1c4cce9af169..aceb8f00b3c05299bc09cc53f87898d7393aa540 100644 (file)
--- a/src/valerie/Makefile
+++ b/src/valerie/Makefile
@@ -42,9 +42,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:       all
-       install -m 755 $(TARGET) $(prefix)/lib/libvalerie$(LIBSUF)
-       mkdir -p "$(prefix)/include/mlt/valerie"
-       install -m 644 $(INCS) "$(prefix)/include/mlt/valerie"
+       install -m 755 $(TARGET) $(DESTDIR)$(prefix)/lib/libvalerie$(LIBSUF)
+       mkdir -p "$(DESTDIR)$(prefix)/include/mlt/valerie"
+       install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/valerie"
 
 ifneq ($(wildcard .depend),)
 include .depend