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

[melted] / src / modules / Makefile

diff --git a/src/modules/Makefile b/src/modules/Makefile
index f30531c..e93ade0 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -5,8 +5,8 @@ include make.inc
 all clean depend:
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
-               if [ -f $$subdir/Makefile ] ; \
-               then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \
+               then $(MAKE) -C $$subdir $@ || exit 1; \
                fi \
        done
 
@@ -14,17 +14,17 @@ dist-clean:
        rm -f consumers.dat filters.dat producers.dat transitions.dat make.inc; \
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
-               if [ -f $$subdir/Makefile ] ; \
-               then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \
+               then $(MAKE) -C $$subdir $@ || exit 1; \
                fi \
        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 ] ; \
-               then [ ! -f disable-$$subdir ] && $(MAKE) -C $$subdir $@; \
+               if [ -f $$subdir/Makefile -a ! -f disable-$$subdir ] ; \
+               then $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
                fi \
        done