diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-03-23 03:45:45 -0500 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2010-05-07 00:05:22 +0100 |
| commit | b65ee580208684655ce824b01a76a06134e13cd8 (patch) | |
| tree | 8177ce7e13a1d3182bc782beadea4056373aed20 | |
| parent | 331b72e1a9fbaa2adf182f944d5e1d63b1c6f95f (diff) | |
Provide pkg-config file
This allows other packages to check for the presence, version, and
installation directory of xkeyboard-config during configure.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | xkeyboard-config.pc.in | 8 |
4 files changed, 15 insertions, 1 deletions
@@ -25,6 +25,7 @@ config.h config.h.in stamp-h1 xkeyboard-config*.tar.* +xkeyboard-config.pc xkeyboard-config.spec xkeyboard-config.prj xkeyboard-config.pws diff --git a/Makefile.am b/Makefile.am index a505587a..e98117e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = xkeyboard-config.pc + EXTRA_DIST=config.rpath COPYING CREDITS README \ autogen.sh \ + xkeyboard-config.pc.in \ xkeyboard-config.spec \ xkeyboard-config.spec.in \ intltool-extract.in intltool-merge.in intltool-update.in diff --git a/configure.in b/configure.in index f74e9462..62a7fd00 100644 --- a/configure.in +++ b/configure.in @@ -13,7 +13,7 @@ fi AC_ARG_WITH( xkb_base, [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])], xkb_base="$withval", - xkb_base="\$(datadir)/X11/xkb" ) + xkb_base="${datadir}/X11/xkb" ) AC_ARG_WITH( xkb_rules_symlink, [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], @@ -75,6 +75,7 @@ symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile +xkeyboard-config.pc xkeyboard-config.spec docs/Makefile ]) diff --git a/xkeyboard-config.pc.in b/xkeyboard-config.pc.in new file mode 100644 index 00000000..d44ba148 --- /dev/null +++ b/xkeyboard-config.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=@datadir@ +xkb_base=@xkb_base@ + +Name: XKeyboardConfig +Description: X Keyboard configuration data +Version: @VERSION@ |