--- codegen/pygobject-codegen-2.0.in +++ codegen/pygobject-codegen-2.0.in @@ -4,7 +4,7 @@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ datadir=@datadir@ -codegendir=@pyexecdir@/gtk-2.0/codegen +codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen PYTHONPATH=$codegendir export PYTHONPATH --- gio/Makefile.am +++ gio/Makefile.am @@ -56,7 +56,7 @@ gio.c: $(GIO_DEFS) $(GIO_OVERRIDES) _gio_la_CFLAGS = $(GIO_CFLAGS) _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio -_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la +_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la _gio_la_SOURCES = \ giomodule.c \ pygio-utils.c \ --- glib/Makefile.am +++ glib/Makefile.am @@ -4,7 +4,7 @@ pkgincludedir = $(includedir)/pygtk-2.0 pkginclude_HEADERS = pyglib.h -lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la +lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la pkgpyexecdir = $(pyexecdir)/gtk-2.0 @@ -19,9 +19,9 @@ common_ldflags += -no-undefined endif -libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS) -libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) -libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = \ +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS) +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = \ pyglib.c \ pyglib.h \ pyglib-private.h \ @@ -29,7 +29,7 @@ _glib_la_CFLAGS = $(GLIB_CFLAGS) _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib" -_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la +_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la _glib_la_SOURCES = \ glibmodule.c \ pygiochannel.c \ --- gobject/Makefile.am +++ gobject/Makefile.am @@ -42,7 +42,7 @@ _gobject_la_LIBADD = \ $(GLIB_LIBS) \ $(FFI_LIBS) \ - $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la + $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la _gobject_la_SOURCES = \ gobjectmodule.c \ pygboxed.c \