+ 64 bit fix for ffmpeg built externally (should switch to pkg-config here)

[melted] / Makefile

diff --git a/Makefile b/Makefile
index cf1e7a1..3723d72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-include config.mak
-
 SUBDIRS = src/framework \
                  src/inigo \
                  src/valerie \
@@ -23,17 +21,21 @@ dist-clean:
        done; \
        rm config.mak;
 
+include 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)$(libdir)"
+       install -d "$(DESTDIR)$(libdir)/pkgconfig"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
+       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/"
        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