From b3e852d29bfd1e90f7e0da409fd0ae36cc01675a Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Fri, 8 Apr 2011 15:36:35 +0200 Subject: [PATCH 1/3] Move codegen to a non-private directory --- codegen/Makefile.am | 2 +- codegen/pygobject-codegen-2.0.in | 3 ++- pygobject-2.0.pc.in | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/codegen/Makefile.am b/codegen/Makefile.am index f9886eb..d714ff2 100644 --- a/codegen/Makefile.am +++ b/codegen/Makefile.am @@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0 bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION) -codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen +codegendir = $(pyexecdir)/gtk-2.0/codegen codegen_SCRIPTS = \ code-coverage.py \ diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in index c5c912e..c04451b 100644 --- a/codegen/pygobject-codegen-2.0.in +++ b/codegen/pygobject-codegen-2.0.in @@ -1,9 +1,10 @@ #!/bin/sh prefix=@prefix@ +exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ datadir=@datadir@ -codegendir=${datadir}/pygobject/2.0/codegen +codegendir=@pyexecdir@/gtk-2.0/codegen PYTHONPATH=$codegendir export PYTHONPATH diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in index a47b685..0d1a811 100644 --- a/pygobject-2.0.pc.in +++ b/pygobject-2.0.pc.in @@ -4,6 +4,7 @@ includedir=@includedir@ datarootdir=@datarootdir@ datadir=@datadir@ libdir=@libdir@ +pyexecdir=@pyexecdir@ # you can use the --variable=pygtkincludedir argument to # pkg-config to get this value. You might want to use this to @@ -12,7 +13,7 @@ pygtkincludedir=${includedir}/pygtk-2.0 fixxref=${datadir}/pygobject/xsl/fixxref.py pygdocs=${datadir}/gtk-doc/html/pygobject defsdir=${datadir}/pygobject/2.0/defs -codegendir=${datadir}/pygobject/2.0/codegen +codegendir=${pyexecdir}/gtk-2.0/codegen overridesdir=@pyexecdir@/gi/overrides Name: PyGObject -- 1.7.4.1