[PATCH wayland 0/2] build: Make wayland-scanner.m4 distributable

Daiki Ueno ueno at gnu.org
Tue Jul 2 02:38:13 PDT 2013


Hi,

Currently, wayland-scanner.m4 is auto-generated with some path
variables (e.g. @prefix@) substituted.  This makes it a bit hard to
use this file in an external project.  See a patch at:
https://code.google.com/p/ibus/issues/detail?id=1617#c13

Here are a couple of minor patches to improve this.

The first patch is not really necessary, but I think $(pkgdatadir) is
more appropriate location than $(datadir)/aclocal for
wayland-scanner.mk.

The second patch moves the path variables into wayland-scanner.pc and
let wayland-scanner.m4 fetch those variables using pkg-config.

Daiki Ueno (2):
  build: Install wayland-scanner.mk under $(pkgdatadir).
  build: Add wayland-scanner.pc.

 Makefile.am                           |  4 ++--
 configure.ac                          |  3 ++-
 src/Makefile.am                       |  3 +++
 src/wayland-scanner-uninstalled.pc.in |  6 ++++++
 src/wayland-scanner.pc.in             |  9 +++++++++
 wayland-scanner.m4                    | 11 +++++++++++
 wayland-scanner.m4.in                 | 16 ----------------
 7 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 src/wayland-scanner-uninstalled.pc.in
 create mode 100644 src/wayland-scanner.pc.in
 create mode 100644 wayland-scanner.m4
 delete mode 100644 wayland-scanner.m4.in

-- 
1.8.3.1



More information about the wayland-devel mailing list