Fix out of tree building of the python bindings

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 5a6990e4cc438bcdaab9fc20053e365d9d048b90..5ab1b08828576b54599762a217978d3bd37fabcc 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -15,12 +15,10 @@ if HAVE_WIN32
 else
        COMPILERARG=
 endif
-       srcdir="$(srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/python" "--build-temp=$(top_builddir)/bindings/python"
+       srcdir="`cd $(srcdir);pwd`" top_builddir="$(abs_top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG)
 
-# FIXME: python setup.py install does not have any option to install from a different build directory
-# so this will not work in a separate builddir
 install:
-       python $(srcdir)/setup.py install
+       top_builddir="$(abs_top_builddir)" srcdir="`cd $(srcdir);pwd`" python $(srcdir)/setup.py install
 
 clean:
        $(RM) -rf build

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 5589b7f9d733422e059a2862c77b7fee5f9ec028..a079c10fe18a664eb784da7506dadecc89aff1e5 100644 (file)
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -92,12 +92,12 @@ source_files = [ 'vlc_module.c' ]
 
 # To compile in a local vlc tree
 vlclocal = Extension('vlc',
-                     sources = [ os.path.join( srcdir, f ) for f in source_files ],
-                     include_dirs = [ top_builddir,
-                                      os.path.join( srcdir, '..', '..', 'include' ),
-                                      srcdir,
-                                      '/usr/win32/include' ],
-                extra_objects = [ ],
+               sources = [ os.path.join( srcdir, f ) for f in source_files ],
+               include_dirs = [ top_builddir,
+                             os.path.join( srcdir, '..', '..', 'include' ),
+                             srcdir,
+                             '/usr/win32/include' ],
+               extra_objects = [ ],
                 extra_compile_args = get_cflags(),
                extra_link_args = linkargs + get_ldflags(),
                 )