[gobject-introspection] Fix broken DATADIR definition after config.py was killed



commit 8b26a23fc74eb54775688436116c92888a301477
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jul 27 19:07:21 2011 +0200

    Fix broken DATADIR definition after config.py was killed
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655437

 Makefile-tools.am             |    2 +-
 tools/g-ir-annotation-tool.in |    2 +-
 tools/g-ir-scanner.in         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile-tools.am b/Makefile-tools.am
index c0dd788..7bc2f3f 100644
--- a/Makefile-tools.am
+++ b/Makefile-tools.am
@@ -2,7 +2,7 @@ bin_PROGRAMS += g-ir-compiler g-ir-generate
 bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool
 EXTRA_DIST += tools/g-ir-scanner.in tools/g-ir-annotation-tool.in
 
-TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@pkgdatadir\@,$(pkgdatadir), -e s,@PYTHON\@,$(PYTHON),
+TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON),
 
 g-ir-scanner: tools/g-ir-scanner.in _giscanner.la Makefile
 	$(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $  tmp && mv $  tmp $@
diff --git a/tools/g-ir-annotation-tool.in b/tools/g-ir-annotation-tool.in
index 49d0b99..5668cbe 100755
--- a/tools/g-ir-annotation-tool.in
+++ b/tools/g-ir-annotation-tool.in
@@ -23,7 +23,7 @@ import os
 import sys
 import __builtin__
 
-__builtin__.__dict__['DATADIR'] = "@pkgdatadir@"
+__builtin__.__dict__['DATADIR'] = "@datarootdir@"
 
 if 'GI_SCANNER_DEBUG' in os.environ:
     def on_exception(exctype, value, tb):
diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in
index 6f2b83e..f709683 100755
--- a/tools/g-ir-scanner.in
+++ b/tools/g-ir-scanner.in
@@ -23,7 +23,7 @@ import os
 import sys
 import __builtin__
 
-__builtin__.__dict__['DATADIR'] = "@pkgdatadir@"
+__builtin__.__dict__['DATADIR'] = "@datarootdir@"
 
 if 'GI_SCANNER_DEBUG' in os.environ:
     def on_exception(exctype, value, tb):



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