summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Verfaillie <dieterv@optionexplicit.be>2011-09-05 16:51:30 +0200
committerDieter Verfaillie <dieterv@optionexplicit.be>2011-09-07 22:36:08 +0200
commit82028495cf54397452f41c3f27bfad1e30ea9d63 (patch)
tree124ea790c55dcc17f486a93c872c59b9678d3997
parent354476089f29452a7e826161b75b454eba07f327 (diff)
downloadgobject-introspection-82028495cf54397452f41c3f27bfad1e30ea9d63.tar.gz
Windows port: additionally set PATH in common.mk
Windows doesn't know about LPATH, but PATH is part of it's .dll search order. https://bugzilla.gnome.org/show_bug.cgi?id=620566
-rw-r--r--common.mk24
1 files changed, 15 insertions, 9 deletions
diff --git a/common.mk b/common.mk
index dcd94d0a..052d5b4b 100644
--- a/common.mk
+++ b/common.mk
@@ -7,11 +7,13 @@
#
INTROSPECTION_SCANNER = \
- env LPATH=.libs \
+ env PATH=.libs:$(PATH) \
+ LPATH=.libs \
PYTHONPATH=$(top_builddir):$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
- $(top_builddir)/g-ir-scanner
+ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+ $(top_builddir)/g-ir-scanner
+
INTROSPECTION_SCANNER_ARGS = \
--verbose \
-I$(top_srcdir) \
@@ -20,7 +22,10 @@ INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(builddir) \
--add-include-path=$(top_builddir)
-INTROSPECTION_COMPILER = $(top_builddir)/g-ir-compiler$(EXEEXT)
+INTROSPECTION_COMPILER = \
+ env PATH=.libs:$(PATH) \
+ $(top_builddir)/g-ir-compiler$(EXEEXT)
+
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=$(top_srcdir)/gir \
@@ -28,8 +33,9 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=$(top_builddir)
INTROSPECTION_DOCTOOL = \
- env LPATH=.libs \
+ env PATH=.libs:$(PATH) \
+ LPATH=.libs \
PYTHONPATH=$(top_builddir):$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
- $(top_builddir)/g-ir-doc-tool
+ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+ $(top_builddir)/g-ir-doc-tool