From 172ae43e82089c4a1c2f65eed55b898001bfea78 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 11 Aug 2004 15:44:05 +0000 Subject: use $(pyexecdir) instead of $(pythondir) as the module as a whole should Wed Aug 11 11:43:07 2004 Jonathan Blandford * Makefile.am: * gtk/Makefile.am: use $(pyexecdir) instead of $(pythondir) as the module as a whole should be installed in the same place, #149849 --- ChangeLog | 7 +++++++ Makefile.am | 6 +++--- gtk/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdb8a97e..b881917e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 11 11:43:07 2004 Jonathan Blandford + + * Makefile.am: + * gtk/Makefile.am: use $(pyexecdir) instead of $(pythondir) + as the module as a whole should be installed in the same place, + #149849 + 2004-08-10 Johan Dahlin * Makefile.am (dist-nodoc): New target diff --git a/Makefile.am b/Makefile.am index 20ffe0c9..687a7bd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,16 +28,16 @@ COMMONDEFS = \ gtk/gdk-types.defs \ gtk/gtk-types.defs -pkgpythondir = $(pythondir)/gtk-2.0 +pkgpythondir = $(pyexecdir)/gtk-2.0 pkgpyexecdir = $(pyexecdir)/gtk-2.0 # this file is common to all pygtk versions. -python_PYTHON = pygtk.py +pyexec_PYTHON = pygtk.py # install pth file. install-data-local: $(mkinstalldirs) $(DESTDIR)$(pythondir) - echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pythondir)/pygtk.pth + echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth install-exec-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth diff --git a/gtk/Makefile.am b/gtk/Makefile.am index eb0314fb..6b07c6f3 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,6 +1,6 @@ PLATFORM_VERSION = 2.0 -pkgpythondir = $(pythondir)/gtk-2.0 +pkgpythondir = $(pyexecdir)/gtk-2.0 pkgpyexecdir = $(pyexecdir)/gtk-2.0 pygtkdir = $(pkgpythondir)/gtk -- cgit v1.2.1