Fix install location for Python bindings

Commit 66137344feb488ea87b0d92f3c03844d9a7a7786 changed the Python detection
mechanism in configure to use AM_PATH_PYTHON. This results in a changed
install location for the Python bindings, at least on Fedora 12 64bit systems.

Before this commit libvirt.py and libvirtmod.so were installed to

  /usr/lib64/python2.6/site-packages

After this commit they are installed to

  /usr/lib/python2.6/site-packages

Mixed Python packages (containing *.py and *.so files) should be installed to
the pyexecdir directory detected by AM_PATH_PYTHON.

This restores the install location from before the AM_PATH_PYTHON commit.

* configure.in: remove unnecessary pythondir export
* python/Makefile.am: switch from pythondir to pyexecdir

diff --git a/configure.in b/configure.in
index 49814e200a781cee028227134345b9a3ddfad014..6135932c8f680445518e19de553d556d319c87b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1443,7 +1443,6 @@ AC_ARG_WITH([python],
 
 PYTHON_VERSION=
 PYTHON_INCLUDES=
-pythondir=
 if test "$with_python" != "no" ; then
     if test -x "$with_python/bin/python"
     then
@@ -1505,7 +1504,6 @@ fi
 AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
 AC_SUBST([PYTHON_VERSION])
 AC_SUBST([PYTHON_INCLUDES])
-AC_SUBST([pythondir])
 
 
 

diff --git a/python/Makefile.am b/python/Makefile.am
index 736631e4a2d2c6c873cc435e28059edc268b3a63..04342b7c1cf5dc78263e143ba1ba4592c0d69595 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -32,7 +32,7 @@ mylibs = $(top_builddir)/src/libvirt.la
 
 all-local: libvirt.py
 
-python_LTLIBRARIES = libvirtmod.la
+pyexec_LTLIBRARIES = libvirtmod.la
 
 libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h
 # Python <= 2.4 header files contain a redundant decl, hence we
@@ -60,14 +60,14 @@ $(GENERATED): generated.stamp
 $(libvirtmod_la_OBJECTS): $(GENERATED)
 
 install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(pythondir)
-       @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pythondir)
+       $(mkinstalldirs) $(DESTDIR)$(pyexecdir)
+       @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pyexecdir)
        $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
        @(for doc in $(DOCS) ; \
           do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
 
 uninstall-local:
-       rm -f $(DESTDIR)$(pythondir)/libvirt.py
+       rm -f $(DESTDIR)$(pyexecdir)/libvirt.py
 
 CLEANFILES= $(GENERATED) generated.stamp