Fix references to bindings/python

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index b4effcedee9cc17694b7f9342bf8b5b9a4801157..083d6a155612a6e6c0b589a198487159a2aabdfe 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1 +1 @@
-SUBDIRS = mediacontrol-python java
+SUBDIRS = python java

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 5b9b7c60a4525501cbe870db8b4b4a97504fb7c7..25253725f083dba5579f85ae6261b531db79fc82 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -16,7 +16,7 @@ else
 endif
 
 all:
-       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"
+       srcdir="$(srcdir)" top_builddir="$(top_builddir)" python "$(srcdir)/setup.py" build $(COMPILERARG) "--build-base=$(top_builddir)/bindings/python" "--build-temp=$(top_builddir)/bindings/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/configure.ac b/configure.ac
index 57a44ce8561d9d06dd3294463f20ab0482f8ce92..20d2c76436d05fab8cb02f92937a49076ebe62ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5356,10 +5356,10 @@ AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 dnl
 dnl  Mediacontrol Python bindings
 dnl
-AC_ARG_ENABLE(mediacontrol-python-bindings,
-  [  --enable-mediacontrol-python-bindings    Enable Python bindings for MediaControl (default disabled)])
+AC_ARG_ENABLE(python-bindings,
+  [  --enable-python-bindings    Enable Python bindings (default disabled)])
 dnl TODO: look for python dev headers
-AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"])
+AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
 
 dnl
 dnl  Java bindings
@@ -5593,7 +5593,7 @@ AC_CONFIG_FILES([
   bindings/Makefile
   bindings/java/Makefile
   bindings/java/src/Makefile
-  bindings/mediacontrol-python/Makefile
+  bindings/python/Makefile
   doc/Makefile
   intl/Makefile
   ipkg/Makefile