diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@gmail.com> | 2015-10-18 13:23:20 +0300 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@gmail.com> | 2015-10-19 20:36:59 +0300 |
| commit | cb956f565785835a6621ca8b89634fe58f59feaf (patch) | |
| tree | 7b1bc95fdc845e09a17bcc7d71ee61304191f683 | |
| parent | 0f912a4cc489ff3e6d9ac5c47b46b618fba7400b (diff) | |
| download | gobject-introspection-cb956f565785835a6621ca8b89634fe58f59feaf.tar.gz | |
Generate relative paths for gio-unix C header includes
In the generated GIR for Gio-2.0, the <c:include/> elements for
gio-unix headers got emitted with absolute pathnames. Obviously, this
does not work well when GIR needs to be checked into repositories,
is used to build in other locations, etc.
https://bugzilla.gnome.org/show_bug.cgi?id=756679
| -rw-r--r-- | Makefile-gir.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile-gir.am b/Makefile-gir.am index 9aca6642..a09260a9 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -152,13 +152,15 @@ GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0) GIO_LIBRARY=gio-2.0 if HAVE_GIO_UNIX -GIO_UNIX_HDRS=$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h +GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0 +GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h GIO_UNIX_PACKAGES = gio-unix-2.0 else +GIO_UNIX_INCLUDEDIR = GIO_UNIX_HDRS= GIO_UNIX_PACKAGES = endif -GIO_CINCLUDES=$(patsubst %,--c-include='%',$(shell echo $(GIO_UNIX_HDRS))) +GIO_CINCLUDES=$(patsubst $(GIO_UNIX_INCLUDEDIR)/%,--c-include='%',$(wildcard $(GIO_UNIX_HDRS))) Gio-2.0.gir: GObject-2.0.gir |