diff options
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | gobject/Makefile.am | 3 | ||||
| -rw-r--r-- | gtk/Makefile.am | 6 |
4 files changed, 18 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 92ad5452..eeb7e3d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,17 +1,19 @@ # require automake-1.7 AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = codegen gobject gtk docs examples tests +SUBDIRS = codegen gobject . gtk docs examples tests + +PLATFORM_VERSION = 2.0 CLEANFILES = EXTRA_DIST = $(defs_DATA) pyexec_LTLIBRARIES = -defsdir = $(pkgdatadir)/2.0/defs +defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = pygtk-2.0.pc +pkgconfig_DATA = pygtk-$(PLATFORM_VERSION).pc INCLUDES = \ $(PYTHON_INCLUDES) \ @@ -35,10 +37,10 @@ python_PYTHON = pygtk.py # install pth file. install-data-local: $(mkinstalldirs) $(DESTDIR)$(pythondir) - echo "gtk-2.0" > $(DESTDIR)$(pythondir)/pygtk.pth + echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pythondir)/pygtk.pth install-exec-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) - echo "gtk-2.0" > $(DESTDIR)$(pyexecdir)/pygtk.pth + echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth uninstall-local: rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth @@ -89,7 +91,7 @@ noinst_PYTHON = ltihooks.py EXTRA_DIST += \ pygtk.spec \ pygtk.spec.in \ - pygtk-2.0.pc.in \ + pygtk-$(PLATFORM_VERSION).pc.in \ MAPPING \ THREADS \ config.h.win32 \ @@ -79,6 +79,10 @@ Optionally a --prefix argument can be specified to install. Note, this is unsupported and is primarily there to support Win32 environments. The configure script is still the preferred way. +Note. If you're installing to another prefix than the one where python +is installed you'll need to set the PYTHONPATH variable to the +$prefix/lib/pythonX.Y/site-packages directory created by +the PyGTK installation. Upgrading ========= diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 68a7eba5..a3e5e876 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -1,7 +1,8 @@ AUTOMAKE_OPTIONS = 1.7 +PLATFORM_VERSION = 2.0 INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -pkgincludedir = $(includedir)/pygtk-2.0 +pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION) pkginclude_HEADERS = pygobject.h pkgpyexecdir = $(pyexecdir)/gtk-2.0 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 12070df0..eb0314fb 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,3 +1,5 @@ +PLATFORM_VERSION = 2.0 + pkgpythondir = $(pythondir)/gtk-2.0 pkgpyexecdir = $(pyexecdir)/gtk-2.0 @@ -6,14 +8,14 @@ pygtk_PYTHON = __init__.py keysyms.py compat.py pygtkexecdir = $(pkgpyexecdir)/gtk -defsdir = $(pkgdatadir)/2.0/defs +defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs defs_DATA = EXTRA_DIST = $(defs_DATA) CLEANFILES = EXTRA_DIST += makefile.msc gtk-fake-win32.c -pkgincludedir = $(includedir)/pygtk-2.0/pygtk +pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)/pygtk pkginclude_HEADERS = pygtk.h INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES) |