01-pyexecsubdir.patch revision 6572
6572N/AUse Solaris-specific subdirectories for 64-bit modules.
6572N/ANot suitable for upstream.
6572N/A
6572N/Adiff -ur pygobject-2.28.6-orig/gi/Makefile.am pygobject-2.28.6/gi/Makefile.am
6572N/A--- pygobject-2.28.6-orig/gi/Makefile.am 2011-06-13 09:30:25.000000000 -0700
6572N/A+++ pygobject-2.28.6/gi/Makefile.am 2016-08-04 17:34:36.614452495 -0700
6572N/A@@ -9,7 +9,7 @@
6572N/A
6572N/A INCLUDES = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib
6572N/A
6572N/A-pygidir = $(pkgpyexecdir)/gi
6572N/A+pygidir = $(pkgpyexecdir)/gi$(pyexecsubdir)
6572N/A pygi_PYTHON = \
6572N/A types.py \
6572N/A module.py \
6572N/Adiff -ur pygobject-2.28.6-orig/gi/overrides/Makefile.am pygobject-2.28.6/gi/overrides/Makefile.am
6572N/A--- pygobject-2.28.6-orig/gi/overrides/Makefile.am 2011-06-13 09:30:25.000000000 -0700
6572N/A+++ pygobject-2.28.6/gi/overrides/Makefile.am 2016-08-04 17:34:50.678153406 -0700
6572N/A@@ -2,7 +2,7 @@
6572N/A
6572N/A pkgpyexecdir = $(pyexecdir)/gi
6572N/A
6572N/A-pygioverridesdir = $(pkgpyexecdir)/overrides
6572N/A+pygioverridesdir = $(pkgpyexecdir)/overrides$(pyexecsubdir)
6572N/A pygioverrides_PYTHON = \
6572N/A GLib.py \
6572N/A Gtk.py \
6572N/Adiff -ur pygobject-2.28.6-orig/gi/repository/Makefile.am pygobject-2.28.6/gi/repository/Makefile.am
6572N/A--- pygobject-2.28.6-orig/gi/repository/Makefile.am 2011-06-13 09:30:25.000000000 -0700
6572N/A+++ pygobject-2.28.6/gi/repository/Makefile.am 2016-08-04 17:35:12.623207412 -0700
6572N/A@@ -2,7 +2,7 @@
6572N/A
6572N/A pkgpyexecdir = $(pyexecdir)/gi
6572N/A
6572N/A-pygirepositorydir = $(pkgpyexecdir)/repository
6572N/A+pygirepositorydir = $(pkgpyexecdir)/repository$(pyexecsubdir)
6572N/A pygirepository_PYTHON = \
6572N/A __init__.py
6572N/A
6572N/Adiff -ur pygobject-2.28.6-orig/gio/Makefile.am pygobject-2.28.6/gio/Makefile.am
6572N/A--- pygobject-2.28.6-orig/gio/Makefile.am 2011-06-13 09:33:49.000000000 -0700
6572N/A+++ pygobject-2.28.6/gio/Makefile.am 2016-08-04 17:36:19.754656487 -0700
6572N/A@@ -17,7 +17,7 @@
6572N/A pyexec_LTLIBRARIES =
6572N/A
6572N/A # gio extension modules
6572N/A-pkgpyexecdir = $(pyexecdir)/gtk-2.0/gio
6572N/A+pkgpyexecdir = $(pyexecdir)/gtk-2.0/gio$(pyexecsubdir)
6572N/A pkgpyexec_LTLIBRARIES =
6572N/A
6572N/A # gio python scripts
6572N/Adiff -ur pygobject-2.28.6-orig/glib/Makefile.am pygobject-2.28.6/glib/Makefile.am
6572N/A--- pygobject-2.28.6-orig/glib/Makefile.am 2011-06-13 09:33:49.000000000 -0700
6572N/A+++ pygobject-2.28.6/glib/Makefile.am 2016-08-04 17:35:46.776048959 -0700
6572N/A@@ -8,7 +8,7 @@
6572N/A
6572N/A pkgpyexecdir = $(pyexecdir)
6572N/A
6572N/A-pyglibdir = $(pkgpyexecdir)/glib
6572N/A+pyglibdir = $(pkgpyexecdir)/glib$(pyexecsubdir)
6572N/A pyglib_PYTHON = \
6572N/A __init__.py \
6572N/A option.py
6572N/Adiff -ur pygobject-2.28.6-orig/gobject/Makefile.am pygobject-2.28.6/gobject/Makefile.am
6572N/A--- pygobject-2.28.6-orig/gobject/Makefile.am 2011-06-13 09:33:49.000000000 -0700
6572N/A+++ pygobject-2.28.6/gobject/Makefile.am 2016-08-04 17:36:41.186640588 -0700
6572N/A@@ -7,7 +7,7 @@
6572N/A pkgpyexecdir = $(pyexecdir)
6572N/A
6572N/A # gobject python scripts
6572N/A-pygobjectdir = $(pkgpyexecdir)/gobject
6572N/A+pygobjectdir = $(pkgpyexecdir)/gobject$(pyexecsubdir)
6572N/A pygobject_PYTHON = \
6572N/A __init__.py \
6572N/A constants.py \
6572N/Adiff -ur pygobject-2.28.6-orig/Makefile.am pygobject-2.28.6/Makefile.am
6572N/A--- pygobject-2.28.6-orig/Makefile.am 2011-06-13 09:33:49.000000000 -0700
6572N/A+++ pygobject-2.28.6/Makefile.am 2016-08-04 18:17:07.974300659 -0700
6572N/A@@ -64,12 +64,13 @@
6572N/A pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
6572N/A
6572N/A # python modules
6572N/A-pkgpyexecdir = $(pyexecdir)/gtk-2.0
6572N/A+pkgpyexecdir = $(pyexecdir)/gtk-2.0$(pyexecsubdir)
6572N/A pkgpyexec_PYTHON = dsextras.py
6572N/A pkgpyexec_LTLIBRARIES =
6572N/A
6572N/A # python
6572N/A-pyexec_PYTHON = pygtk.py
6572N/A+toppyexecdir = $(pyexecdir)$(pyexecsubdir)
6572N/A+toppyexec_PYTHON = pygtk.py
6572N/A pyexec_LTLIBRARIES =
6572N/A
6572N/A # linker flags
6572N/A@@ -80,13 +81,13 @@
6572N/A
6572N/A # install pth file.
6572N/A install-data-local:
6572N/A- $(mkinstalldirs) $(DESTDIR)$(pythondir)
6572N/A- echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth
6572N/A+ $(mkinstalldirs) $(DESTDIR)$(pyexecdir)$(pyexecsubdir)
6572N/A+ echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)$(pyexecsubdir)/pygtk.pth
6572N/A install-exec-local:
6572N/A- $(mkinstalldirs) $(DESTDIR)$(pyexecdir)
6572N/A- echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth
6572N/A+ $(mkinstalldirs) $(DESTDIR)$(pyexecdir)$(pyexecsubdir)
6572N/A+ echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)$(pyexecsubdir)/pygtk.pth
6572N/A uninstall-local:
6572N/A- rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth
6572N/A+ rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)$(pyexecsubdir)/pygtk.pth
6572N/A
6572N/A EGG_NAME = $(PACKAGE)-$(PACKAGE_VERSION)-py$(PYTHON_VERSION)-$(PLATFORM).egg
6572N/A