summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-04-15 16:29:32 +0000
committerGustavo J. A. M. Carneiro <gjc@src.gnome.org>2006-04-15 16:29:32 +0000
commitf1ce8d89acfed9d30b0dee5a7c508a0bf966e5f1 (patch)
treeff39950127244be1cc85f6e869fd93493dec4986
parent8e2c1d4131c8f22b79f5d22cde845700007dfe24 (diff)
downloadpygobject-f1ce8d89acfed9d30b0dee5a7c508a0bf966e5f1.tar.gz
pygobject-f1ce8d89acfed9d30b0dee5a7c508a0bf966e5f1.tar.xz
pygobject-f1ce8d89acfed9d30b0dee5a7c508a0bf966e5f1.zip
fix gobject installation dir
-rw-r--r--ChangeLog6
-rw-r--r--gobject/Makefile.am10
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 791a11a..3c0acd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-15 Gustavo J. A. M. Carneiro <gjc@gnome.org>
+
+ * gobject/Makefile.am: Fix pygobject installation dir: install
+ both _gobject.la and __init__.py into
+ $(pyexecdir)/gtk-2.0/gobject.
+
2006-04-11 Johan Dahlin <jdahlin@async.com.br>
* gobject/gobjectmodule.c (init_gobject):
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index d8e17c3..aa7cae7 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -6,16 +6,18 @@ pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
pkginclude_HEADERS = pygobject.h
pkgpyexecdir = $(pyexecdir)/gtk-2.0
-pkgpyexec_LTLIBRARIES = _gobject.la
+
+# gobject python scripts
+pygobjectdir = $(pkgpyexecdir)/gobject
+pygobject_PYTHON = __init__.py
+pygobject_LTLIBRARIES = _gobject.la
+
common_ldflags = -module -avoid-version
if PLATFORM_WIN32
common_ldflags += -no-undefined
endif
-# gobject python scripts
-pygobjectdir = $(pkgpythondir)/gtk
-pygobject_PYTHON = __init__.py
_gobject_la_CFLAGS = $(GLIB_CFLAGS)
_gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject