diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | python/Makefile.am | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 49814e200..6135932c8 100644 --- 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 736631e4a..04342b7c1 100644 --- 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 |