mediacontrol-python: try to fix r16794

diff --git a/bindings/mediacontrol-python/Makefile.am b/bindings/mediacontrol-python/Makefile.am
index ccc63fba6687eaa8eafab76539384eaf7522c78e..5b9b7c60a4525501cbe870db8b4b4a97504fb7c7 100644 (file)
--- a/bindings/mediacontrol-python/Makefile.am
+++ b/bindings/mediacontrol-python/Makefile.am
@@ -16,7 +16,7 @@ else
 endif
 
 all:
-       top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/mediacontrol-python" "--build-temp=$(top_builddir)/bindings/mediacontrol-python"
+       srcdir="$(srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/mediacontrol-python" "--build-temp=$(top_builddir)/bindings/mediacontrol-python"
 
 # 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

diff --git a/bindings/mediacontrol-python/setup.py b/bindings/mediacontrol-python/setup.py
index 2004799433ff5536369c28e7c82f413698cc115b..269e0b3ebdb91c67b303dcd16026f18016788f3e 100644 (file)
--- a/bindings/mediacontrol-python/setup.py
+++ b/bindings/mediacontrol-python/setup.py
@@ -14,17 +14,15 @@ if not top_builddir:
     os.environ['top_builddir'] = top_builddir
 
 try:
-    top_srcdir=os.environ['top_srcdir']
+    srcdir=os.environ['srcdir']
 except KeyError:
     # Note: same as above
     srcdir=None
-if not top_srcdir:
-    top_srcdir = os.path.join( '..', '..' )
-    os.environ['top_srcdir'] = top_srcdir
+if not srcdir:
+    srcdir = '.'
 
-vlclib= "-L"  + os.path.join( top_builddir, 'src') + " -lvlc"
+vlclib="-lvlc"
 picflag=''
-srcdir=os.path.join( top_srcdir, 'bindings', 'mediacontrol-python' )
 
 def get_vlcconfig():
     vlcconfig=None
@@ -79,12 +77,12 @@ source_files = [ 'vlc_module.c' ]
 vlclocal = Extension('vlc',
                      sources = [ os.path.join( srcdir, f ) for f in source_files ],
                      include_dirs = [ top_builddir,
-                                      os.path.join( top_srcdir, 'include' ),
+                                      os.path.join( srcdir, '..', '..', 'include' ),
                                       srcdir,
                                       '/usr/win32/include' ],
                 extra_objects = [ vlclib ],
                 extra_compile_args = get_cflags(),
-               extra_link_args = [ '-L' + top_builddir ]  + get_ldflags(),
+               extra_link_args = [ '-L' + os.path.join(top_builddir, 'src') ]  + get_ldflags(),
                 )
 
 setup (name = 'VLC Bindings',