X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=Makefile;h=e4d80600c52371e46cfd6c6624127641cb9fba13;hb=3c49866137bb2b3bde5b79007668c8d651a710cd;hp=cf1e7a1ecee4f7de9f209c25682adeaf66764f1d;hpb=ea140e0bb1a1ed69ab97477d3e8ead5e6da68aed;p=melted

diff --git a/Makefile b/Makefile
index cf1e7a1..e4d8060 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-include config.mak
-
 SUBDIRS = src/framework \
 		  src/inigo \
 		  src/valerie \
@@ -15,7 +13,7 @@ all clean:
 		$(MAKE) -C $$subdir $@ || exit 1; \
 	done
 
-dist-clean:
+distclean:
 	rm mlt-config packages.dat; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
@@ -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