Fix out-of-tree build.

This fixes 'make install' and 'make dist' for out-of-tree builds.

diff --git a/Makefile.am b/Makefile.am
index 5227cc3ecb17f86db9b5881368317ebc7c9046c1..b7136a01fb13bfb1f664e2df747a67acfb23dfdc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,13 +59,15 @@ ChangeLog:
 
 dist-hook: ChangeLog
        $(MKDIR_P) $(distdir)/tools
 
 dist-hook: ChangeLog
        $(MKDIR_P) $(distdir)/tools

-       cp tools/install-decoders $(distdir)/tools
+       cp ${top_srcdir}/tools/install-decoders $(distdir)/tools

        $(MKDIR_P) $(distdir)/decoders
        $(MKDIR_P) $(distdir)/decoders

-       tools/install-decoders -o $(distdir)/decoders
+       ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+               -o $(distdir)/decoders

 
 install-decoders:
        $(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
 
 install-decoders:
        $(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)

-       tools/install-decoders -o $(DESTDIR)$(DECODERS_DIR)
+       ${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
+               -o $(DESTDIR)$(DECODERS_DIR)

 
 install-data-hook: install-decoders
 
 
 install-data-hook: install-decoders