Skip to content

Commit

Permalink
Provide pkg-config file
Browse files Browse the repository at this point in the history
This allows other packages to check for the presence, version, and
installation directory of xkeyboard-config during configure.
  • Loading branch information
yselkowitz authored and Sergey V. Udaltsov committed May 6, 2010
1 parent 331b72e commit b65ee58
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)],
Expand Down Expand Up @@ -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
])
Expand Down
8 changes: 8 additions & 0 deletions xkeyboard-config.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
prefix=@prefix@
datarootdir=@datarootdir@
datadir=@datadir@
xkb_base=@xkb_base@

Name: XKeyboardConfig
Description: X Keyboard configuration data
Version: @VERSION@

0 comments on commit b65ee58

Please sign in to comment.