Merge mlt++/CUSTOMISING into docs/melted++.

[melted] / Makefile

diff --git a/Makefile b/Makefile
index afc885e..264fdaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,12 +41,12 @@ install:
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
        done; \
        if test -z "$(DESTDIR)"; then \
-         /sbin/ldconfig || true; \
+         /sbin/ldconfig 2> /dev/null || true; \
        fi
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)"/mlt-config
-       rm -f "$(DESTDIR)$(libdir)/pkgconfig/mlt-*.pc"
+       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-*.pc
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \
@@ -57,5 +57,4 @@ uninstall:
 dist:
        [ -d "mlt-$(version)" ] && rm -rf "mlt-$(version)" || echo
        svn export http://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt "mlt-$(version)"
-       svn log > "mlt-$(version)/ChangeLog"
        tar -cvzf "mlt-$(version).tar.gz" "mlt-$(version)"