diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-01-17 13:57:20 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-01-17 13:57:20 +0200 |
| commit | f9febb64c5dc15e03ecf3ca552e0654ee919b52e (patch) | |
| tree | a6f694927514fdcd7eef4c1563c3ac2a6dccc725 /Makefile.am | |
| parent | b76ee75aad975849ce8a55d10c55e5090dd33d8f (diff) | |
| parent | aeb5b481c95c6bd71e3025a7965861ab82a643b8 (diff) | |
| download | jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.zip jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.tar.gz jansson-f9febb64c5dc15e03ecf3ca552e0654ee919b52e.tar.bz2 | |
Merge branch '1.1'
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 185eaab..a141cd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,3 +2,6 @@ EXTRA_DIST = CHANGES LICENSE README.rst SUBDIRS = doc src test check-local: html + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = jansson.pc |