[jhbuild] keep track of jhbuild source directory even when installing via autotools



commit 6d10bfbd59008434b8de48c864a5cca45b8bd1a5
Author: Frederic Peters <fpeters 0d be>
Date:   Tue May 12 11:26:49 2009 +0200

    keep track of jhbuild source directory even when installing via autotools
---
 scripts/Makefile.am |    1 +
 scripts/jhbuild.in  |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 36ee33f..d12c2a2 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -5,6 +5,7 @@ CLEANFILES = jhbuild
 
 jhbuild: jhbuild.in
 	sed						\
+		-e s!\ srcdir\@!$(abs_top_srcdir)!	\
 		-e s!\ prefix\@!$(prefix)!		\
 		-e s!\ datadir\@!$(datadir)!		\
 		-e s!\ pkgdatadir\@!$(pkgdatadir)!	\
diff --git a/scripts/jhbuild.in b/scripts/jhbuild.in
index 7eb0894..4937515 100644
--- a/scripts/jhbuild.in
+++ b/scripts/jhbuild.in
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import sys
+import os
 import __builtin__
 
 USE_CHECKOUT_SRC = False
@@ -9,12 +10,15 @@ if USE_CHECKOUT_SRC:
     sys.path.insert(0, '@jhbuilddir@')
     pkgdatadir = None
     datadir = None
+    srcdir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 else:
     pkgdatadir = "@pkgdatadir@"
     datadir = "@datadir@"
+    srcdir = "@srcdir@"
 
 __builtin__.__dict__['PKGDATADIR'] = pkgdatadir
 __builtin__.__dict__['DATADIR'] = datadir
+__builtin__.__dict__['SRCDIR'] = srcdir
 
 import jhbuild.main
 jhbuild.main.main(sys.argv[1:])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]