aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-07 08:37:48 +0200
committermarha <marha@users.sourceforge.net>2011-07-07 08:37:48 +0200
commitdbe01a4f78f09723b327d1d8522bfa5026c4f6e0 (patch)
tree8b770c826cf9f64cb61ff3efd1c2f01aeb2dc8c9 /xkbcomp/Makefile.am
parentd5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826 (diff)
parent47a6ae678489d7082b5d7da35d1a92b4233fb5eb (diff)
downloadvcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.gz
vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.bz2
vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/opt_constant_propagation.cpp mesalib/src/mesa/program/ir_to_mesa.cpp
Diffstat (limited to 'xkbcomp/Makefile.am')
-rw-r--r--xkbcomp/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am
index d0e991df3..01632f1f0 100644
--- a/xkbcomp/Makefile.am
+++ b/xkbcomp/Makefile.am
@@ -60,6 +60,9 @@ xkbcomp_SOURCES = \
xkbpath.h \
xkbscan.c
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xkbcomp.pc
+
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL